tree ffec3bb733ca10d3f7a11f8febb2377b3aec04d4
parent 883985f61246ff7457325da454886bf71e40058c
parent a57e456a7b28431b55e407e5ab78ebd5b378d19e
author Linus Torvalds <torvalds@linux-foundation.org> 1440518465 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1440518465 -0700

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fix from Thomas Gleixner:
 "A single fix for a APIC regression introduced in 4.0 which went
  undetected until now.

  I screwed up the x2apic cleanup in a subtle way.  The screwup is only
  visible on systems which have x2apic preenabled in the BIOS and need
  to disable it during boot"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Fix fallout from x2apic cleanup