]> 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>
Thu, 3 Nov 2011 01:56:09 +0000 (12:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 01:56:09 +0000 (12:56 +1100)
commitaaa206a6a142154da4f91785994efe98eefa766a
tree3c4687af86873fbcb464b7b5cac98321102d03a9
parent43ec461a8e8acf81b067576bf3342557f1660d34
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
15 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/Kconfig
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