diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-05-04 20:20:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-05-04 20:20:42 +0200 |
commit | 0214196ce0e941256797bf54b2fcf1450452df2a (patch) | |
tree | e61fd92b7abe72d6954d28fdfe3fc176c416c446 /arch/x86/boot/Makefile | |
parent | Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | x86/efi: earlyprintk=efi,keep fix (diff) | |
download | linux-0214196ce0e941256797bf54b2fcf1450452df2a.tar.xz linux-0214196ce0e941256797bf54b2fcf1450452df2a.zip |
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>
Diffstat (limited to 'arch/x86/boot/Makefile')
0 files changed, 0 insertions, 0 deletions