]> 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, 29 Sep 2011 23:58:32 +0000 (09:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 23:58:32 +0000 (09:58 +1000)
commite19ad6e36c882bc9cc093bf9c3d529493517a0c1
treedf0c4252007f944bd44b0b208f79d0e13dda68a4
parent00d2a4b4779c2406d8459ebd065579e70c3125bd
parent91ccb8386fe3f0523160a69b800c6383748f8fc3
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/mm/mmu.c
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/kernel/head.S
arch/arm/kernel/setup.c