]> 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, 5 Dec 2011 23:22:56 +0000 (10:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 23:22:56 +0000 (10:22 +1100)
commitc0d7703b07d8b974653ff3aa146c8465cb4f7393
tree9c5bb304b12d2d8a8d3246467cb81c4b2a4c6375
parentd63b49030a339c2a0ef0c014105991f63738ccd9
parent2a24f17f8f8ec3f4ae9014b3feb2ee8527e6d8ee
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/mm/ioremap.c
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/system.h
arch/arm/mm/idmap.c
arch/arm/mm/ioremap.c
arch/arm/mm/mmu.c