]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h

1  2 
arch/arm/include/asm/system.h
arch/arm/kernel/head.S
arch/arm/mm/idmap.c

Simple merge
Simple merge
Simple merge