From: Linus Torvalds Date: Thu, 17 May 2012 16:57:13 +0000 (-0700) Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma X-Git-Tag: v3.4~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1be5f0b7575e090fd100a98b303860879b5800de;p=profile%2Fcommon%2Fkernel-common.git Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma Pull slave-dmaengine fixes fromVinod Koul: "fixes of cylic dma usages in slave dma drivers" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: fix cyclic dma usage dmaengine: pl330: dont complete descriptor for cyclic dma --- 1be5f0b7575e090fd100a98b303860879b5800de