From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Oct 2013 20:35:15 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.12-rc4~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=831ae3c1df085ad0d0815042469c6f77d42c3754;p=profile%2Fcommon%2Fkernel-common.git

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
---

831ae3c1df085ad0d0815042469c6f77d42c3754