Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jul 2013 23:25:50 +0000 (16:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jul 2013 23:25:50 +0000 (16:25 -0700)
commit4d6f843a38fa26035598f1f35181aa5f328db897
tree0a2fa0b492ae121dc937f08efd5ba6ef9d110db3
parent55a0d3ff603a69ea4ec7677effd457f838390afc
parentd3768d885c6ccbf8a137276843177d76c49033a7
Merge branch 'x86-efi-for-linus' of git://git./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()
arch/x86/boot/compressed/eboot.c
arch/x86/include/asm/efi.h
arch/x86/platform/efi/efi.c