diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-26 14:59:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-26 14:59:01 -0700 |
| commit | f761237eee55222fdb509c79e784a67ab3d72cbd (patch) | |
| tree | a07de02671fe0967a3b23f4f9fecf1a70555fb14 /net | |
| parent | 64b1cbaa1068f38994230df2aa0fee7033008399 (diff) | |
| parent | 26fd12209c08fe947be1828896ef4ffc5bd0e6df (diff) | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"Three fixes for slave dmanegine.
Two are for typo omissions in sifr dmaengine driver and the last one
is for the imx driver fixing a missing unlock"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: sirf: fix a typo in moving running dma_desc to active queue
dmaengine: sirf: fix a typo in dma_prep_interleaved
dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions