tree f2710538446443891fdec1a4e9c264c79966ae9f
parent 6b458ac195c51790830b2267bdf3edaae27eab3e
parent d1a792f3b4072bfac4150bb62aa34917b77fdb6d
author Linus Torvalds <torvalds@linux-foundation.org> 1405229090 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1405229090 -0700

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
 "We have two small fixes.  First one from Daniel to handle 0-length
  packets for usb cppi dma.  Second by Russell for imx-sdam cyclic
  residue reporting"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  Update imx-sdma cyclic handling to report residue
  dma: cppi41: handle 0-length packets