From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Oct 2012 21:59:01 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.7-rc3~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f761237eee55222fdb509c79e784a67ab3d72cbd;p=karo-tx-linux.git

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

Pull slave-dmaengine fixes from Vinod Koul:
 "Three fixes for slave dmanegine.

  Two are for typo omissions in sifr dmaengine driver and the last one
  is for the imx driver fixing a missing unlock"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: sirf: fix a typo in moving running dma_desc to active queue
  dmaengine: sirf: fix a typo in dma_prep_interleaved
  dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()
---

f761237eee55222fdb509c79e784a67ab3d72cbd