diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-06 22:35:15 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-06 22:35:15 +0200 |
commit | 831ae3c1df085ad0d0815042469c6f77d42c3754 (patch) | |
tree | 169216c49f50dd849e8c54454241ef8332ea384f /include/drm | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
parent | dmaengine: imx-dma: fix callback path in tasklet (diff) | |
download | linux-831ae3c1df085ad0d0815042469c6f77d42c3754.tar.xz linux-831ae3c1df085ad0d0815042469c6f77d42c3754.zip |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"Here is the slave dmanegine fixes. We have the fix for deadlock issue
on imx-dma by Michael and Josh's edma config fix along with author
change"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: imx-dma: fix callback path in tasklet
dmaengine: imx-dma: fix lockdep issue between irqhandler and tasklet
dmaengine: imx-dma: fix slow path issue in prep_dma_cyclic
dma/Kconfig: Make TI_EDMA select TI_PRIV_EDMA
edma: Update author email address
Diffstat (limited to 'include/drm')
0 files changed, 0 insertions, 0 deletions