From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 31 Jul 2015 07:55:26 +0000 (+0200)
Subject: Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming... 
X-Git-Tag: firefly_0821_release~176^2~1334^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1adb9123f96a2553b5b373aff1eb6ae939d31d5c;p=firefly-linux-kernel-4.4.55.git

Merge tag 'efi-urgent' of git://git./linux/kernel/git/mfleming/efi into x86/urgent

Pull EFI fixes from Matt Fleming:

 * Fix an EFI boot issue preventing a Parallels virtual machine from
   booting because the upper 32-bits of the EFI memmap pointer were
   being discarded in setup_e820(). (Dmitry Skorodumov)

 * Validate that the "efi" kernel parameter gets used with an argument,
   otherwise we will oops. (Ricardo Neri)

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

1adb9123f96a2553b5b373aff1eb6ae939d31d5c