]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'dmaengine/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 12 Mar 2013 00:12:14 +0000 (11:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 12 Mar 2013 00:12:14 +0000 (11:12 +1100)
commit02043535fcd450ff6ce4d4b0a018fd0f3ddbae6f
treef865b5796802477c34deca73eca312266abd9ab2
parent77bdc269d2ce65f9cd8bb6fb898915fa1ff4b23a
parent7f3498666c7b44f979720404d9ba883c309e60ad
Merge remote-tracking branch 'dmaengine/next'

Conflicts:
drivers/dma/ioat/dma_v3.c