diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 19:20:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 19:20:22 +0100 |
| commit | 527c680f7c36ff17d49efc99632232dba3549c51 (patch) | |
| tree | ae72c69971ff8dce4cc17b0035bd6abb2651a110 /drivers/watchdog/w83697ug_wdt.c | |
| parent | Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 (diff) | |
| parent | dmaengine: dw_dmac: move to generic DMA binding (diff) | |
| download | linux-527c680f7c36ff17d49efc99632232dba3549c51.tar.xz linux-527c680f7c36ff17d49efc99632232dba3549c51.zip | |
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()
Diffstat (limited to 'drivers/watchdog/w83697ug_wdt.c')
0 files changed, 0 insertions, 0 deletions