]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 77f6ee9 bba902c)
Merge remote-tracking branch 'arm-lpae/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 01:03:45 +0000 (12:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 01:03:45 +0000 (12:03 +1100)
commit8281943ef933aabcabb2c3293b2d8051ddbc5f28
tree286332a89a09553f1d58f81b5b8686eaeca2f7adtree | snapshot
parent77f6ee9a4da8c259b8a6a3660c2557c92b88d0d2commit | diff
parentbba902cdcaa8858ca08a9c2423c328ef3499ad14commit | 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