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)
Merge in EFI memblock changes from Ard, which form the preparatory work
for UEFI support on 32-bit ARM.

1  2 
arch/arm64/mm/init.c
arch/arm64/mm/mmu.c

Simple merge
Simple merge