From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Sep 2014 20:45:16 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: firefly_0821_release~176^2~3163
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4092dc8f0bcc0963c045460157107d7461a094d7;p=firefly-linux-kernel-4.4.55.git

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
---

4092dc8f0bcc0963c045460157107d7461a094d7