]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Aug 2013 18:46:07 +0000 (11:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Aug 2013 18:46:07 +0000 (11:46 -0700)
commitda391af21c4b162cff03d0e6876ec2d13fc31483
tree511da8fd63dd7517489f14351655b52912e5442f
parent26a43f376858887e49f9cda5545e484884051c42
parent8ca6a5ff66e86b27a935aeeacc3dd121d3bbe91b
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()