summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-28 13:45:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-28 13:45:16 -0700
commit4092dc8f0bcc0963c045460157107d7461a094d7 (patch)
tree2f659d7ce5b5ea8e9fc27292e69f0b2a84caee04 /Makefile
parent1e3827bf8aebe29af2d6e49b89d85dfae4d0154f (diff)
parentbfb607451786829430ecdd5bcd51c5dac03e3639 (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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions