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)
Conflicts:
arch/x86/kernel/crash.c

Merged for semantic conflict:
arch/x86/kernel/reboot.c


Trivial merge