tree 29eda8d4437983a99a601de56b30137dc79f30a1
parent 2390c0fca6d31af0c1194a491d9629fbe27703b8
parent 88c08a3fba9954ce0ec3e1eab07c498a419ad7e3
author Linus Torvalds <torvalds@linux-foundation.org> 1335479616 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1335479616 -0700

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