| commit | 4092dc8f0bcc0963c045460157107d7461a094d7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Sep 28 13:45:16 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Sep 28 13:45:16 2014 -0700 |
| tree | 2f659d7ce5b5ea8e9fc27292e69f0b2a84caee04 | |
| parent | 1e3827bf8aebe29af2d6e49b89d85dfae4d0154f [diff] | |
| parent | bfb607451786829430ecdd5bcd51c5dac03e3639 [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