]> 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, 18 Aug 2011 01:43:02 +0000 (11:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 18 Aug 2011 01:43:02 +0000 (11:43 +1000)
commit5c3c5c85610833d228a24baa728ebb2631b7c0ef
tree6c646b4f61db7f43274579215f0d9497c75e6fd8
parent9f7de5ebe58de051e96b7e016da15588b0748a71
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