Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Apr 2015 18:30:36 +0000 (11:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Apr 2015 18:30:36 +0000 (11:30 -0700)
commit0a4812798fae4f6bfcaab51e31b3898ff5ea3108
treea482ba16f9873cb3b44d68fb2104143d4fef1618
parent8172ba51e257fdd353010cd7caaa37c8bc9eb44a
parentfbef403aa7b377eb238dc6cade21213c315bc1a7
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