tree 4118af6b25e3d8cac90a4ec63918f869671c2109
parent bddffa28dc70dfb9fca08006f3bc0695069833b3
parent fce7d3bfc0ae70ca2a57868f2a9708b13185fd1f
author Linus Torvalds <torvalds@linux-foundation.org> 1388352904 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1388352904 -0800

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

Pull x86 fixes from Peter Anvin:
 "There is a small EFI fix and a big power regression fix in this batch.

  My queue also had a fix for downing a CPU when there are insufficient
  number of IRQ vectors available, but I'm holding that one for now due
  to recent bug reports"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/efi: Don't select EFI from certain special ACPI drivers
  x86 idle: Repair large-server 50-watt idle-power regression