tree 0a2fa0b492ae121dc937f08efd5ba6ef9d110db3
parent 55a0d3ff603a69ea4ec7677effd457f838390afc
parent d3768d885c6ccbf8a137276843177d76c49033a7
author Linus Torvalds <torvalds@linux-foundation.org> 1372807550 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1372807550 -0700

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

Pull x86 EFI changes from Ingo Molnar:
 "Two fixes that should in principle increase robustness of our
  interaction with the EFI firmware, and a cleanup"

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: retry ExitBootServices() on failure
  efi: Convert runtime services function ptrs
  UEFI: Don't pass boot services regions to SetVirtualAddressMap()