Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Jun 2015 17:19:34 +0000 (10:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Jun 2015 17:19:34 +0000 (10:19 -0700)
commitff25ea8f4eeea252bfcaf65289fa57ba6de080dd
treefc945fd4e974972c7920e9949d1c3e7d4172ceb2
parent8a7deb362b764cd557380a3c753f0118304eaa77
parent429770823d961187c39df490d49683c467b10065
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