Merge branches 'x86/cleanups', 'x86/mpparse', 'x86/numa' and 'x86/uv' into x86/urgent

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

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

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

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

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