Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Sep 2013 20:29:18 +0000 (13:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Sep 2013 20:29:18 +0000 (13:29 -0700)
commit654fdd041227d7de1594baa61c58f2c87bd0640f
tree8eb6c24923f5bc103eddf29b62c446aaa8e4447f
parent82dfaa58a79c121be3611ce549dec806f2e6004f
parent7a20c2fad61aa3624e83c671d36dbd36b2661476
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "An EFI fix and two reboot-quirk fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
  x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically
  x86, efi: Don't map Boot Services on i386