]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 948a7b2 c415b3d)
Merge branch 'x86/crashdump' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:24:52 +0000 (13:24 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:24:52 +0000 (13:24 +0100)
commit855caa37b9b61c1ccfeb91a2bc04d90bfc5e4525
treef95e80165c293f43321b17c4280acfca478d9ba8tree | snapshot
parent948a7b2b5e2bf126fb697aeb11ff379b2c85dd2ecommit | diff
parentc415b3dce30dfb41234e118662e8720f47343a4fcommit | diff
Merge branch 'x86/crashdump' into cpus4096

Conflicts:
arch/x86/kernel/crash.c

Merged for semantic conflict:
arch/x86/kernel/reboot.c
arch/x86/kernel/reboot.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.