]> 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: cfe9bfb 7f34986)
Merge remote-tracking branch 'dmaengine/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 01:18:32 +0000 (12:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 01:18:32 +0000 (12:18 +1100)
Conflicts:
drivers/dma/ioat/dma_v3.c


Trivial merge
Linux kernel for KaRo TX COM modules