]> 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, 18 Nov 2011 00:07:19 +0000 (11:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 00:07:19 +0000 (11:07 +1100)
commit180eb7ba9dcc1ecaea55418f341df4aa485d1e4b
tree608b45395051ed600a588f968281f80810118916
parenta5a57cab42ca1e8ced9076d718d555ccc23f6259
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