Merge tag 'dmaengine-fix-4.5' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Mar 2016 18:57:18 +0000 (10:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Mar 2016 18:57:18 +0000 (10:57 -0800)
commit20698c922f81047c4d45c7793b7ddce8ff58d10e
treea24d1fe48615fcf2e33c4136c92b208d624d42f1
parent7ae9c768e19ec8ce1b397a5c4abf88f9ee053e09
parent25c5e9626ca4d40928dc9c44f009ce2ed0a739e7
Merge tag 'dmaengine-fix-4.5' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fixes from Vinod Koul:
 "Two fixes showed up in last few days, and they should be included in
  4.5.  Summary:

  Two more late fixes to drivers, nothing major here:

   - A memory leak fix in fsdma unmap the dma descriptors on freeup

   - A fix in xdmac driver for residue calculation of dma descriptor"

* tag 'dmaengine-fix-4.5' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: at_xdmac: fix residue computation
  dmaengine: fsldma: fix memory leak