Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jun 2012 05:12:52 +0000 (22:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jun 2012 05:12:52 +0000 (22:12 -0700)
commit7940b2adb474608318e51294d4e9fa0eee1bef61
tree2fde5c3547a4e3f69bd9db74187deda6c75b57f8
parent2ce5682947872061148b0e5ed2212e03d0d8bc8b
parentfdec53d5203ee3d44be7c09d1524e3a6287d46a7
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
 "A few fixes in pl330 and imx-sdma drivers."

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  DMA: PL330: Fix racy mutex unlock
  DMA: PL330: Add missing static storage class specifier
  dma: imx-sdma: buf_tail should be initialize in prepare function
  dmaengine: pl330: dont complete descriptor for cyclic dma