From: Linus Torvalds Date: Wed, 20 Jan 2016 18:15:21 +0000 (-0800) Subject: Merge tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma X-Git-Tag: MMI-PSA29.97-13-9~8659 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9fa686068a32ddf256df03982b3e3967c18654a8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma Pull dmaengine fixes from Vinod Koul: "Here is my second pull request for this window: A few driver fixes have piled up and one missed rcar bindings patch which got somehow lost in for-linus branch so cherry-picked that one. Fixes are for dw, at_hdmac, edma" * tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: rcar-dmac: Document SoC specific bindings dmaengine: at_xdmac: fix resume for cyclic transfers dmaengine: dw: fix cyclic transfer callbacks dmaengine: dw: fix cyclic transfer setup dmaengine: edma: Fix paRAM slot allocation for entry channel 0 --- 9fa686068a32ddf256df03982b3e3967c18654a8