From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Apr 2016 22:52:38 +0000 (-0700)
Subject: Merge tag 'dmaengine-fix-4.6-rc4' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v4.14-rc1~3422
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=306a63bee192859ebd32c7328c7766636d882d8f;p=platform%2Fkernel%2Flinux-rpi.git

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
---

306a63bee192859ebd32c7328c7766636d882d8f