]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Mar 2013 18:20:22 +0000 (10:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Mar 2013 18:20:22 +0000 (10:20 -0800)
commit527c680f7c36ff17d49efc99632232dba3549c51
treeae72c69971ff8dce4cc17b0035bd6abb2651a110
parent23caaeea271cfe3176f0e27374d2016bd7583ea8
parentf9c6a655a94042f94c0adb30d07d93cfd8915e95
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()
drivers/dma/dw_dmac.c