author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 24 Jan 2013 18:17:49 +0000 (10:17 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 24 Jan 2013 18:17:49 +0000 (10:17 -0800) |
Pull slave-dmaengine fixes from Vinod Koul:
"A few fixes on slave dmanengine. There are trivial fixes in imx-dma,
tegra-dma & ioat driver"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma: tegra: implement flags parameters for cyclic transfer
dmaengine: imx-dma: Disable use of hw_chain to fix sg_dma transfers.
ioat: Fix DMA memory sync direction correct flag
"A few fixes on slave dmanengine. There are trivial fixes in imx-dma,
tegra-dma & ioat driver"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma: tegra: implement flags parameters for cyclic transfer
dmaengine: imx-dma: Disable use of hw_chain to fix sg_dma transfers.
ioat: Fix DMA memory sync direction correct flag
1 | 2 | |||
---|---|---|---|---|
drivers/dma/ioat/dma_v3.c | patch | | diff1 | | diff2 | | blob | history |
drivers/dma/tegra20-apb-dma.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/dma/ioat/dma_v3.c
Simple merge
diff --cc drivers/dma/tegra20-apb-dma.c
Simple merge