]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Sep 2014 17:11:29 +0000 (10:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Sep 2014 17:11:29 +0000 (10:11 -0700)
Pull dmaengine fixes from Vinod Koul:
 "Two minor fixes.

  First one from Kuninori clarifying dmas bindings and second from Lars
  for fixing dma descriptor completion in non cyclic case"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: jz4740: Fix non-cyclic descriptor completion
  dt/bindings: rcar-audmapp: tidyup dmas explanation


Trivial merge