Merge branch 'x86-apic-for-linus' of git://git./linux/kernel/git/tip/tip
Pull x86/apic changes from Ingo Molnar:
"Two main changes:
- improve local APIC Error Status Register reporting robustness
- add the 'disable_cpu_apicid=x' boot parameter for kexec booting"
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, apic: Make disabled_cpu_apicid static read_mostly, fix typos
x86, apic, kexec: Add disable_cpu_apicid kernel parameter
x86/apic: Read Error Status Register correctly