From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Oct 2012 18:08:12 +0000 (-0700)
Subject: Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.7-rc1~185
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3b29b03a462346473b7d0e6c6013fe093a4ac0d1;p=~emulex%2Finfiniband.git

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:
 "EFI loader robustness enhancements plus smaller fixes"

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
  efi: Add a function to look up existing IO memory mappings
  efi: Defer freeing boot services memory until after ACPI init
  x86, EFI: Calculate the EFI framebuffer size instead of trusting the firmware
  efifb: Skip DMI checks if the bootloader knows what it's doing
  efi: initialize efi.runtime_version to make query_variable_info/update_capsule workable
  efi: Build EFI stub with EFI-appropriate options
  X86: Improve GOP detection in the EFI boot stub
---

3b29b03a462346473b7d0e6c6013fe093a4ac0d1