]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6102694 b0d153e)
Merge remote-tracking branch 'arm-lpae/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 27 Nov 2011 23:43:44 +0000 (10:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 27 Nov 2011 23:43:44 +0000 (10:43 +1100)
commit883fa65a22a41b4d0bf8bde45bbb2408ec9a0db4
treeddfffb2eee7e3264da02f25082ec8f667b9d4bc7tree | snapshot
parent6102694c1ae02f4dff40026ecfbf4d69ab62bb62commit | 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