Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 19:50:01 +0000 (11:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 19:50:01 +0000 (11:50 -0800)
commit1a7dbbcc8cc6b34f3a4ae92026759fc057ffcba2
tree1efa6cab2815c889ba8fbc928eab47f76c721e49
parent6c6461435611e1d4843516f2d55e8316c009112e
parent5b4d1dbc24bb6fd7179ada0f47be34e27e64decb
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
Documentation/kernel-parameters.txt