]> 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>
Wed, 16 Nov 2011 23:58:34 +0000 (10:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 23:58:34 +0000 (10:58 +1100)
commitcbe6d08311c3992a33aa7eecff1486fb6dcd21ca
tree4057bdbb8811ae2d37709a91e79fcfd2a542118e
parent112bca267a231880daea746c69bfb39e7887b7d3
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