Merge branch 'linus' into tmp.x86.mpparse.new

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Kconfig.debug
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

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

diff --cc arch/x86/kernel/head_32.S
Simple merge

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

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

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

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

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc mm/page_alloc.c
Simple merge