]> 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>
Thu, 24 Nov 2011 00:39:21 +0000 (11:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 00:39:21 +0000 (11:39 +1100)
commite059851ac4fb9ecf319b5efb2311c8824c8090d4
treee3b63a76419598deded57807e11982b651f3324e
parente28004b526e686d581923b4a463d78c25bc6336f
parentb0d153e5e150baacb83738b392974663964af32f
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/Kconfig
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/system.h
arch/arm/kernel/head.S
arch/arm/mm/idmap.c
arch/arm/mm/ioremap.c
arch/arm/mm/mmu.c