From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Aug 2013 18:46:07 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.11-rc4~1
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=e56c75617259652cad3103c78c829277aa3c0bab;p=cascardo%2Flinux.git

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

Pull dmaengine fixes from Vinod Koul:
 "Two fixes for slave dmaengine.  The first fixes cyclic dma transfers
  for pl330 and the second one makes us return the correct error code on
  probe"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dma: pl330: Fix cyclic transfers
  pch_dma: fix error return code in pch_dma_probe()
---

e56c75617259652cad3103c78c829277aa3c0bab