diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-17 00:52:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-17 00:52:38 +0200 |
| commit | 306a63bee192859ebd32c7328c7766636d882d8f (patch) | |
| tree | 62d5344b0d7d2df6f0a629a2297fff9d0e264e02 /include | |
| parent | Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | Merge branch 'fix/edma' into fixes (diff) | |
| download | linux-306a63bee192859ebd32c7328c7766636d882d8f.tar.xz linux-306a63bee192859ebd32c7328c7766636d882d8f.zip | |
Merge tag 'dmaengine-fix-4.6-rc4' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"This time we have some odd fixes in hsu, edma, omap and xilinx.
Usual fixes and nothing special"
* tag 'dmaengine-fix-4.6-rc4' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: dw: fix master selection
dmaengine: edma: special case slot limit workaround
dmaengine: edma: Remove dynamic TPTC power management feature
dmaengine: vdma: don't crash when bad channel is requested
dmaengine: omap-dma: Do not suppress interrupts for memcpy
dmaengine: omap-dma: Fix polled channel completion detection and handling
dmaengine: hsu: correct use of channel status register
dmaengine: hsu: correct residue calculation of active descriptor
dmaengine: hsu: set HSU_CH_MTSR to memory width
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions