Merge branch 'linus' into core/percpu

Conflicts:
	arch/x86/include/asm/fixmap_64.h

diff --cc Makefile
Simple merge

diff --cc arch/blackfin/kernel/irqchip.c
Simple merge

diff --cc arch/x86/kernel/efi.c
Simple merge

diff --cc arch/x86/kernel/efi_64.c
Simple merge

diff --cc arch/x86/kernel/reboot.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/lguest/boot.c
Simple merge

diff --cc include/linux/sched.h
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

diff --cc kernel/softirq.c
Simple merge