Merge branches 'x86/cleanups', 'x86/kexec', 'x86/mce2' and 'linus' into x86/core
Ingo Molnar [Wed, 11 Mar 2009 09:49:15 +0000 (10:49 +0100)]
1  2  3  4 
arch/x86/lguest/boot.c
init/Kconfig
kernel/fork.c

Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/fork.c
Simple merge