Skip to content
  • Linus Torvalds's avatar
    Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · 527c680f
    Linus Torvalds authored
    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()
    527c680f