Merge branch 'aarch64/efi' into aarch64/for-next/core
authorWill Deacon <will.deacon@arm.com>
Tue, 15 Dec 2015 10:59:03 +0000 (10:59 +0000)
committerWill Deacon <will.deacon@arm.com>
Tue, 15 Dec 2015 10:59:03 +0000 (10:59 +0000)
commit129b985cc3f331d0e6908958f50757a3a1b37793
tree310de459f120ca99eaa30127a517212a16dccfd6
parent32d6397805d00573ce1fa55f408ce2bca15b0ad3
parentf7d924894265794f447ea799dd853400749b5a22
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.
arch/arm64/mm/init.c
arch/arm64/mm/mmu.c