tree 8eb6c24923f5bc103eddf29b62c446aaa8e4447f
parent 82dfaa58a79c121be3611ce549dec806f2e6004f
parent 7a20c2fad61aa3624e83c671d36dbd36b2661476
author Linus Torvalds <torvalds@linux-foundation.org> 1380140958 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1380140958 -0700

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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