Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
authorIngo Molnar <mingo@kernel.org>
Sat, 2 Apr 2016 07:31:10 +0000 (09:31 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 2 Apr 2016 07:31:10 +0000 (09:31 +0200)
Pull EFI/arm64 fix from Matt Fleming:

" * Fix a boot crash on arm64 caused by a recent commit to mark the EFI
    memory map as 'MEMBLOCK_NOMAP' which causes the regions to be
    omitted from the kernel direct mapping - Ard Biesheuvel "

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

Trivial merge