]> 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, 27 Sep 2011 01:05:28 +0000 (11:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 01:05:28 +0000 (11:05 +1000)
commitc005027688adcef08955a73e33f879b8dc76470e
treef39cf45f2b95e43cb6c81d8c7a393f89e8b2586d
parent571e1c19ef49037d67eb49c91a7f3d5135bf65cc
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