projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e3827b bfb6074)
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <[email protected]>
Sun, 28 Sep 2014 20:45:16 +0000 (13:45 -0700)
committerLinus Torvalds <[email protected]>
Sun, 28 Sep 2014 20:45:16 +0000 (13:45 -0700)
commit4092dc8f0bcc0963c045460157107d7461a094d7
tree2f659d7ce5b5ea8e9fc27292e69f0b2a84caee04tree | snapshot
parent1e3827bf8aebe29af2d6e49b89d85dfae4d0154fcommit | diff
parentbfb607451786829430ecdd5bcd51c5dac03e3639commit | diff
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
 "Two small fixes for omap dmaengine driver which fixes cyclic suspend
  and resume"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: omap-dma: Restore the CLINK_CTRL in resume path
  dmaengine: omap-dma: Add memory barrier to dma_resume path
John Crispins staging tree