]> 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, 9 Aug 2011 23:33:19 +0000 (09:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 23:33:19 +0000 (09:33 +1000)
commit134122145570f8716d5ff785d2486c96724ad9c3
tree7ddc6b927327d2178127f39baff57845e721bfd9
parentcd5b11cc9d01d2de13f6808a74ca383655a86e9d
parent6a692549726ad9153893291d29b5008ccacbc32d
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/module.c
arch/arm/mm/alignment.c