Merge branch 'linus' into core/percpu
Ingo Molnar [Wed, 11 Mar 2009 09:29:28 +0000 (10:29 +0100)]
Conflicts:
arch/x86/include/asm/fixmap_64.h

13 files changed:
1  2 
Makefile
arch/blackfin/kernel/irqchip.c
arch/x86/kernel/efi.c
arch/x86/kernel/efi_64.c
arch/x86/kernel/reboot.c
arch/x86/kernel/setup.c
arch/x86/lguest/boot.c
include/linux/sched.h
init/Kconfig
init/main.c
kernel/fork.c
kernel/sched.c
kernel/softirq.c

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