Merge tag 'efi-urgent' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 7 Feb 2014 19:27:30 +0000 (11:27 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 7 Feb 2014 19:27:30 +0000 (11:27 -0800)
 * Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).

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

Trivial merge