Merge branch 'aarch64/efi' into aarch64/for-next/core

Merge in EFI memblock changes from Ard, which form the preparatory work
for UEFI support on 32-bit ARM.

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc arch/arm64/mm/mmu.c
Simple merge