From: Linus Torvalds Date: Sat, 7 Mar 2015 19:52:03 +0000 (-0800) Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=374dab2366c64666612b8f6275f8c373a373b8d0;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma Pull slave-dmaengine fixes from Vinod Koul: "This contains small fixes spread across the drivers" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: mmp_pdma: fix warning about slave caps dmaengine: qcom_bam_dma: fix wrong register offsets dmaengine: bam-dma: fix a warning about missing capabilities dmaengine: ioatdma: workaround for incorrect DMACAP register dmaengine: at_xdmac: fix for chan conf simplification dmaengine: dw: don't handle interrupt when dmaengine is not used dma: mmp-tdma: refine dma disable and dma-pos update dmaengine: shdma: Move DMA stop to (runtime) suspend callbacks dmaenegine: mmp-pdma: fix irq handler overwrite physical chan issue --- 374dab2366c64666612b8f6275f8c373a373b8d0