diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-04 11:46:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-04 11:46:07 -0700 |
| commit | e56c75617259652cad3103c78c829277aa3c0bab (patch) | |
| tree | 511da8fd63dd7517489f14351655b52912e5442f /crypto/cipher.c | |
| parent | 3d90268f79d3be17914ebacd31f3ed69cea8eab1 (diff) | |
| parent | fc51446021f42aca8906e701fc2292965aafcb15 (diff) | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"Two fixes for slave dmaengine. The first fixes cyclic dma transfers
for pl330 and the second one makes us return the correct error code on
probe"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma: pl330: Fix cyclic transfers
pch_dma: fix error return code in pch_dma_probe()
Diffstat (limited to 'crypto/cipher.c')
0 files changed, 0 insertions, 0 deletions