From: Linus Torvalds Date: Thu, 4 Jun 2015 17:19:34 +0000 (-0700) Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff25ea8f4eeea252bfcaf65289fa57ba6de080dd;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma Pull dmaengine fixes from Vinod Koul: "We have two small fixes: - pl330 termination hang fix by Krzysztof - hsu memory leak fix by Peter" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: hsu: Fix memory leak when stopping a running transfer dmaengine: pl330: Fix hang on dmaengine_terminate_all on certain boards --- ff25ea8f4eeea252bfcaf65289fa57ba6de080dd