From: Linus Torvalds Date: Thu, 8 Sep 2011 23:49:32 +0000 (-0700) Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma X-Git-Tag: upstream/snapshot3+hdmi~9130 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4e436e0bd480668834fe6849a52c5397b7be4fb;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine/ste_dma40: fix memory leak due to prepared descriptors dmaengine/ste_dma40: fix Oops due to double free of client descriptor dmaengine/ste_dma40: remove duplicate call to d40_pool_lli_free(). dmaengine/ste_dma40: add missing kernel doc for pending_queue --- e4e436e0bd480668834fe6849a52c5397b7be4fb