]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4896ac8 b0d153e)
Merge remote-tracking branch 'arm-lpae/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 00:11:04 +0000 (11:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 00:11:04 +0000 (11:11 +1100)
commite47c3b043393997e6a5f93e5f6716a4fad8fb890
treeb8ccd8bcae574fd2143cc2e50c20fdf4f8d3ca8ftree | snapshot
parent4896ac8dce3ec3c0c8b12de02d8b0593c0a2873acommit | diff
parentb0d153e5e150baacb83738b392974663964af32fcommit | diff
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 diff1 | diff2 | blob | history
arch/arm/include/asm/pgtable.h diff1 | diff2 | blob | history
arch/arm/include/asm/system.h diff1 | diff2 | blob | history
arch/arm/kernel/head.S diff1 | diff2 | blob | history
arch/arm/mm/idmap.c diff1 | diff2 | blob | history
arch/arm/mm/ioremap.c diff1 | diff2 | blob | history
arch/arm/mm/mmu.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules