]> 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>
Tue, 30 Aug 2011 01:58:22 +0000 (11:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Aug 2011 01:58:22 +0000 (11:58 +1000)
commita157dd4086f2fd5aeff0007067b3eed61bcfc9bf
tree5415a4024152829411e33241621d3a6c395a2ca5
parente4c9df88813e45c161379e70f7c7f26b82c0dc00
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