From: Linus Torvalds 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-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4092dc8f0bcc0963c045460157107d7461a094d7;p=openwrt%2Fstaging%2Fblogic.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