From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 19 Sep 2014 10:49:20 +0000 (+0200)
Subject: Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming... 
X-Git-Tag: v3.17-rc7~6^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=43657ffb79eba5234333d8657457774c0d3bff46;p=users%2Fjedix%2Flinux-maple.git

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

Pull EFI fix from Matt Fleming:

  * Increase the number of early_ioremap() slots to fix a regression with
    earlyprintk=efi after recent changes to the ACPI code (Dave Young)

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

43657ffb79eba5234333d8657457774c0d3bff46