Merge branches 'cpus4096', 'x86/cleanups' and 'x86/urgent' into x86/percpu

diff --cc arch/sparc/kernel/time_64.c
Simple merge

diff --cc arch/x86/include/asm/tlbflush.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/smpboot.c
Simple merge

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