]> 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>
Mon, 22 Aug 2011 00:58:14 +0000 (10:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 00:58:14 +0000 (10:58 +1000)
commitba5c24dc7c4caa9057b82a1e9f3ba522eb3b59f9
tree2b54e2b990e0665acb073d369ebac3ffd88ba3c1
parentb1947ac5ba39635db69d7d23e8b558853ef60616
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