Merge branch 'x86/cleanups' into auto-x86-next

diff --cc arch/x86/include/asm/apic.h
Simple merge

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

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

diff --cc arch/x86/kernel/cpu/mcheck/mce_intel_64.c
Simple merge

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

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

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