Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
authorIngo Molnar <mingo@kernel.org>
Sun, 4 May 2014 18:20:42 +0000 (20:20 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 4 May 2014 18:20:42 +0000 (20:20 +0200)
Pull EFI fix from Matt Fleming:

" * Fix earlyprintk=efi,keep support by switching to an ioremap() mapping
    of the framebuffer when early_ioremap() is no longer available and
    dropping __init from functions that may be invoked after
    free_initmem() - Dave Young "

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

Trivial merge