Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 May 2012 16:57:13 +0000 (09:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 May 2012 16:57:13 +0000 (09:57 -0700)
commit1be5f0b7575e090fd100a98b303860879b5800de
tree039e46bc92b93e68dbb9645413d5fd5007a411d6
parent42e8b9c00176dd3a2f11d05f195131bac851558b
parentd41160524d8d8ee721296e5c7e15f1ed727df7eb
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes fromVinod Koul:
 "fixes of cylic dma usages in slave dma drivers"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: fix cyclic dma usage
  dmaengine: pl330: dont complete descriptor for cyclic dma