summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-11 20:35:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-11 20:35:11 -0700
commitcfb63bafdb87bbcdc5d6dbbca623d3f69475f118 (patch)
tree6bc2f07f7818b0a6aafc08058ace24322c7bf5cd /fs
parenta3ab02b4c5d2ba0eff137a9442b80944ce2d9366 (diff)
parent765024697807ad1e1cac332aa891253ca4a339da (diff)
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul: "The first one fixes issue in pl330 to check for DT compatible and the second one fixes omap-dma to start without delay" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: omap-dma: Start DMA without delay for cyclic channels DMA: PL330: Add check if device tree compatible
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions