diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-12 05:35:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-12 05:35:11 +0200 |
| commit | cfb63bafdb87bbcdc5d6dbbca623d3f69475f118 (patch) | |
| tree | 6bc2f07f7818b0a6aafc08058ace24322c7bf5cd /fs/proc/generic.c | |
| parent | Merge tag 'pm-3.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... (diff) | |
| parent | dmaengine: omap-dma: Start DMA without delay for cyclic channels (diff) | |
| download | linux-cfb63bafdb87bbcdc5d6dbbca623d3f69475f118.tar.xz linux-cfb63bafdb87bbcdc5d6dbbca623d3f69475f118.zip | |
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/proc/generic.c')
0 files changed, 0 insertions, 0 deletions