From: H. Peter Anvin <hpa@linux.intel.com>
Date: Fri, 14 Feb 2014 19:11:18 +0000 (-0800)
Subject: Merge remote-tracking branch 'efi/urgent' into x86/urgent
X-Git-Tag: v3.14-rc3~8^2
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=31fce91e7afc25c666276f65f019bc13fd27e216;p=unionfs-2.6.39.y.git

Merge remote-tracking branch 'efi/urgent' into x86/urgent

There have been reports of EFI crashes since -rc1. The following two
commits fix known issues.

 * Fix boot failure on 32-bit EFI due to the recent EFI memmap changes
   merged during the merge window - Borislav Petkov

 * Avoid a crash during efi_bgrt_init() by detecting invalid BGRT
   headers based on the 'status' field.

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

31fce91e7afc25c666276f65f019bc13fd27e216