Merge branch 'arm64/efi'

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/mmu.h
Simple merge

diff --cc arch/arm64/kernel/setup.c
Simple merge

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