Merge tag 'efi-urgent' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 25 Apr 2013 21:00:22 +0000 (14:00 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 25 Apr 2013 21:00:22 +0000 (14:00 -0700)
 * The EFI variable anti-bricking algorithm merged in -rc8 broke booting
   on some Apple machines because they implement EFI spec 1.10, which
   doesn't provide a QueryVariableInfo() runtime function and the logic
   used to check for the existence of that function was insufficient.
   Fix from Josh Boyer.

 * The anti-bricking algorithm also introduced a compiler warning on
   32-bit. Fix from Borislav Petkov.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Trivial merge