From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 4 May 2014 18:20:42 +0000 (+0200)
Subject: Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming... 
X-Git-Tag: v3.15-rc5~1^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0214196ce0e941256797bf54b2fcf1450452df2a;p=thirdparty%2Fkernel%2Flinux.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:

" * 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>
---

0214196ce0e941256797bf54b2fcf1450452df2a