]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdcad5ea5ff646388f5610781db47f3fb1a7428f5
tree169216c49f50dd849e8c54454241ef8332ea384f
parent41f13ae44101dbba45ec3ccdee11edb5ce146ca2
parentb1ad37da222d91f7090a1cd768ad0c6b9ef5532c
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