Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
	arch/arm/include/asm/pgalloc.h
	arch/arm/include/asm/pgtable.h
	arch/arm/include/asm/tlb.h
	arch/arm/kernel/head.S
	arch/arm/mm/dma-mapping.c
	arch/arm/mm/mmu.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/include/asm/system.h
Simple merge

diff --cc arch/arm/kernel/head.S
Simple merge

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