Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
authorIngo Molnar <mingo@kernel.org>
Fri, 19 Sep 2014 10:49:20 +0000 (12:49 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 19 Sep 2014 10:49:20 +0000 (12:49 +0200)
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>

Trivial merge