]> 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, 13 Sep 2011 01:37:21 +0000 (11:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 01:37:21 +0000 (11:37 +1000)
commit1b801121d6dd20639a11bc022100c065c38e75ba
tree1cdef75cc9f52b7d094021ad0b664565f3e642af
parentab2bfa0aadf5afbebc2cbbcce1b2709f180de254
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