]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-lpae/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 22:54:51 +0000 (09:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 22:54:51 +0000 (09:54 +1100)
commite8b602d3250729144afc287ee5070ef614fba85a
tree6c5c0105e1b32bde3e6c134e316591298f1ae842
parent99ec923722988c4bb3e4e37d1adfd6869d078147
parentbba902cdcaa8858ca08a9c2423c328ef3499ad14
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/include/asm/system.h
arch/arm/kernel/head.S
arch/arm/mm/idmap.c