]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-lpae/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 02:05:08 +0000 (12:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 02:05:08 +0000 (12:05 +1000)
commite40ee857b6c8102f5bea73ad882fc62805efb4d8
treefb37acecf95357ab26340f70189ad711e5f090c8
parent107f1223d6bd5ebc2ba269747769fe84fcee3dca
parent91ccb8386fe3f0523160a69b800c6383748f8fc3
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
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/kernel/head.S
arch/arm/kernel/setup.c