Merge commit 'v2.6.29-rc4' into x86/cleanups

diff --cc arch/x86/include/asm/io.h
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/mach-voyager/setup.c
Simple merge

diff --cc arch/x86/mm/init_32.c
Simple merge