]> 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, 1 Nov 2011 23:18:50 +0000 (10:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 23:18:50 +0000 (10:18 +1100)
commit411aff88f09e850420feae9f1e6e443639ef3da7
tree2aa8bc036d0808e7c280328584a93345a5ca1a9f
parent0035963921aa30852d38129db0cf5c5b880d8983
parent3c311198085ccddc90d27462cebc8d1af528d913
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
14 files changed:
arch/arm/Kconfig
arch/arm/boot/compressed/head.S
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/proc-fns.h
arch/arm/include/asm/system.h
arch/arm/kernel/head.S
arch/arm/kernel/hw_breakpoint.c
arch/arm/kernel/setup.c
arch/arm/kernel/sleep.S
arch/arm/mm/alignment.c
arch/arm/mm/context.c
arch/arm/mm/fault.c
arch/arm/mm/ioremap.c
arch/arm/mm/mmu.c