Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Jul 2014 05:24:50 +0000 (22:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Jul 2014 05:24:50 +0000 (22:24 -0700)
commit28b1fae568b125aa8ef3f092b9dda1fdb94ba18a
treef2710538446443891fdec1a4e9c264c79966ae9f
parent6b458ac195c51790830b2267bdf3edaae27eab3e
parentd1a792f3b4072bfac4150bb62aa34917b77fdb6d
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