Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Oct 2013 20:35:15 +0000 (13:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Oct 2013 20:35:15 +0000 (13:35 -0700)
commit831ae3c1df085ad0d0815042469c6f77d42c3754
tree169216c49f50dd849e8c54454241ef8332ea384f
parente62063d69911886a5a92c719d262a2a87e1e5b60
parentfcaaba6c7136fe47e5a13352f99a64b019b6d2c5
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