Linus Torvalds
527c680f7c
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()
2013-03-03 10:20:22 -08:00
..
bestcomm
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00
ioat
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
ipu
ppc4xx
sh
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
amba-pl08x.c
at_hdmac.c
at_hdmac_regs.h
coh901318.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
coh901318.h
coh901318_lli.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
dmaengine.c
dmaengine: convert to idr_alloc()
2013-02-27 19:10:15 -08:00
dmaengine.h
dmatest.c
dw_dmac.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-03-03 10:20:22 -08:00
dw_dmac_regs.h
dmaengine: dw_dmac: move to generic DMA binding
2013-02-28 09:53:21 +05:30
edma.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
ep93xx_dma.c
fsldma.c
fsldma.h
imx-dma.c
imx-sdma.c
intel_mid_dma.c
intel_mid_dma_regs.h
iop-adma.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
iovlock.c
Kconfig
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
Makefile
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
mmp_pdma.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
mmp_tdma.c
mpc512x_dma.c
mv_xor.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
mv_xor.h
mxs-dma.c
of-dma.c
omap-dma.c
pch_dma.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
pl330.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
sa11x0-dma.c
sirf-dma.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
ste_dma40.c
ste_dma40_ll.c
ste_dma40_ll.h
tegra20-apb-dma.c
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
timb_dma.c
TODO
txx9dmac.c
txx9dmac.h
virt-dma.c
virt-dma.h