]> 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>
Mon, 12 Sep 2011 01:15:28 +0000 (11:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 01:15:28 +0000 (11:15 +1000)
commit1de8df45ad74be52aef235ff769f4aa5b4457a5c
treef3c3518ccc095285ce4a58c146b4cd4171717b81
parentcb5e66fdd3aea50cf30232dcbae8ebbcb45b3e6f
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