]> 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>
Wed, 31 Aug 2011 23:45:35 +0000 (09:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 23:45:35 +0000 (09:45 +1000)
commit84aa4bbc45bad7dc5c3dcc6af853cb7f8d52bb50
tree9517bf1610d417ce97bad92e437a8193a9b3e630
parent79d9c47c9bd75331639a61a53144aebe3cfe8fe3
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