From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Apr 2012 22:33:36 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.4-rc5~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=acdf2fc860f785781bb304a7f178141541f85283;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull [GIT PULL] slave-dmaengine fixes from Vinod Koul.

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine/amba-pl08x : reset phychan_hold on terminate all
  dma: pl330: fix a couple of compilation warnings
  dma/ste_dma40: fix erroneous comparison
  dma/ste_dma40: explicitly include regulator consumer header
  dma40: Improve the logic of stopping logical chan
  dmaengine: at_hdmac: remove clear-on-read in atc_dostart()
  dma: mxs-dma: enable channel in device_issue_pending call
  dmaengine: imx-dma: dont complete descriptor for cyclic dma
---

acdf2fc860f785781bb304a7f178141541f85283