From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Mar 2013 18:20:22 +0000 (-0800)
Subject: Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=527c680f7c36ff17d49efc99632232dba3549c51;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Pull second set of slave-dmaengine updates from Vinod Koul:
 "Arnd's patch moves the dw_dmac to use generic DMA binding.  I agreed
  to merge this late as it will avoid the conflicts between trees.

  The second patch from Matt adding a dma_request_slave_channel_compat
  API was supposed to be picked up, but somehow never got picked up.
  Some patches dependent on this are already in -next :("

* 'next' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: dw_dmac: move to generic DMA binding
  dmaengine: add dma_request_slave_channel_compat()
---

527c680f7c36ff17d49efc99632232dba3549c51