]> 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, 28 Sep 2014 20:45:16 +0000 (13:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Sep 2014 20:45:16 +0000 (13:45 -0700)
commit130cde5224b264fa2ef6149a195ba572482d3e9a
tree2f659d7ce5b5ea8e9fc27292e69f0b2a84caee04
parent31c7c3bc9bb18b0e2bdf5e020e3b7b7a803cc964
parenta4ab74108eb4020669f9a026553fccf764c5a5db
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