From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 13 Jul 2014 05:24:50 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.16-rc5~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=28b1fae568b125aa8ef3f092b9dda1fdb94ba18a;p=karo-tx-linux.git

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
---

28b1fae568b125aa8ef3f092b9dda1fdb94ba18a