]> 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>
Fri, 19 Aug 2011 00:05:49 +0000 (10:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 00:05:49 +0000 (10:05 +1000)
commit79230857ab249ad14784c5d4bb5e31fd635bcd71
tree91b8f5679bd033ca95ffceb8d118f1ffe10cba3d
parent24c302cbe74d15bb29b67902d363c508295e07a6
parent5a70cc044e74e72550c806a1b0fc82fc11130dc3
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/tlb.h
arch/arm/Kconfig
arch/arm/kernel/head.S
arch/arm/kernel/module.c
arch/arm/kernel/setup.c
arch/arm/mm/alignment.c