]> 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, 14 Sep 2011 01:01:20 +0000 (11:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Sep 2011 01:01:20 +0000 (11:01 +1000)
commit5d1b8ee2aca02dd399127a6e41841e6061ee3c8d
treec2de15a4df0e638f18b7a860975e5b76cc72c44a
parent88a251ab30ddc26f98e6298114d63d16b26ae220
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/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
arch/arm/Kconfig
arch/arm/include/asm/proc-fns.h
arch/arm/include/asm/system.h
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/arm/kernel/sleep.S