]> 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, 3 Aug 2011 01:17:19 +0000 (11:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 01:17:19 +0000 (11:17 +1000)
commit7bf0012b33d41cf8e541a4de3548000d168e2701
treeb9ad4a555994f80c4778c5527aa3856c4079b458
parentc6d3711b11c268767581208344f45626ea22d2a5
parent5287a6293d19fa8d7d504c59a1143cada747f09a
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/proc-fns.h
arch/arm/include/asm/tlb.h
arch/arm/mm/context.c
arch/arm/mm/proc-v7.S
19 files changed:
arch/arm/Kconfig
arch/arm/boot/compressed/head.S
arch/arm/include/asm/assembler.h
arch/arm/include/asm/memory.h
arch/arm/include/asm/proc-fns.h
arch/arm/include/asm/setup.h
arch/arm/include/asm/tlbflush.h
arch/arm/kernel/head.S
arch/arm/kernel/module.c
arch/arm/kernel/setup.c
arch/arm/kernel/sleep.S
arch/arm/mm/Kconfig
arch/arm/mm/alignment.c
arch/arm/mm/dma-mapping.c
arch/arm/mm/fault.c
arch/arm/mm/mm.h
arch/arm/mm/mmu.c
arch/arm/mm/proc-macros.S
arch/arm/mm/proc-v7.S