]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a14f333 ded389d)
Merge remote-tracking branch 'xtensa/for_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:41:00 +0000 (09:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:41:00 +0000 (09:41 +1100)
Conflicts:
arch/xtensa/boot/boot-elf/Makefile
scripts/mod/modpost.c


Trivial merge
Linux kernel for KaRo TX COM modules