diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-12 22:24:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-12 22:24:50 -0700 |
commit | 28b1fae568b125aa8ef3f092b9dda1fdb94ba18a (patch) | |
tree | f2710538446443891fdec1a4e9c264c79966ae9f /arch/parisc | |
parent | 6b458ac195c51790830b2267bdf3edaae27eab3e (diff) | |
parent | d1a792f3b4072bfac4150bb62aa34917b77fdb6d (diff) | |
download | linux-28b1fae568b125aa8ef3f092b9dda1fdb94ba18a.tar.bz2 |
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
Diffstat (limited to 'arch/parisc')
0 files changed, 0 insertions, 0 deletions