]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-lpae/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Aug 2011 01:09:35 +0000 (11:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Aug 2011 01:09:35 +0000 (11:09 +1000)
commit8291881792476110fcb2ffb20a5dd2ee4b5c4f45
tree1647820c99daa64950efd6e0d86a0e39c528ff8b
parent2d31d603839b9bc4d8d020a72f7e11d13963fd74
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