From: Linus Torvalds Date: Thu, 2 Apr 2015 18:30:36 +0000 (-0700) Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0a4812798fae4f6bfcaab51e31b3898ff5ea3108;p=deliverable%2Flinux.git Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma Pull dmaengine fixes from Vinod Koul: "This time we have addition of caps for jz4740 which fixes intentional warning at boot. Then we have memory leak issues in drivers using virt-dma by Peter on few drive" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: moxart-dma: Fix memory leak when stopping a running transfer dmaengine: bcm2835-dma: Fix memory leak when stopping a running transfer dmaengine: omap-dma: Fix memory leak when terminating running transfer dmaengine: edma: fix memory leak when terminating running transfers dmaengine: jz4740: Define capabilities --- 0a4812798fae4f6bfcaab51e31b3898ff5ea3108