Linus Torvalds ca2a650f3d Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dma updates from Vinod Koul: - new driver for BCM2835 used in R-pi - new driver for MOXA ART - dma_get_any_slave_channel API for DT based systems - minor fixes and updates spread acrooss driver [ The fsl-ssi dual fifo mode support addition clashed badly with the other changes to fsl-ssi that came in through the sound merge. I did a very rough cut at fixing up the conflict, but Nicolin Chen (author of both sides) will need to verify and check things ] * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (36 commits) dmaengine: mmp_pdma: fix mismerge dma: pl08x: Export pl08x_filter_id acpi-dma: align documentation with kernel-doc format dma: fix vchan_cookie_complete() debug print DMA: dmatest: extend the "device" module parameter to 32 characters drivers/dma: fix error return code dma: omap: Set debug level to debugging messages dmaengine: fix kernel-doc style typos for few comments dma: tegra: add support for Tegra148/124 dma: dw: use %pad instead of casting dma_addr_t dma: dw: join split up messages dma: dw: fix style of multiline comment dmaengine: k3dma: fix sparse warnings dma: pl330: Use dma_get_slave_channel() in the of xlate callback dma: pl330: Differentiate between submitted and issued descriptors dmaengine: sirf: Add device_slave_caps interface DMA: Freescale: change BWC from 256 bytes to 1024 bytes dmaengine: Add MOXA ART DMA engine driver dmaengine: Add DMA_PRIVATE to BCM2835 driver dma: imx-sdma: Assign a default script number for ROM firmware cases ...		2014-01-29 20:27:23 -08:00
..
bestcomm
dw	dma: dw: use %pad instead of casting dma_addr_t	2014-01-20 13:56:37 +05:30
ioat	drivers/dma/ioat/dma.c: check DMA mapping error in ioat_dma_self_test()	2014-01-02 14:40:30 -08:00
ipu
ppc4xx	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-01-29 20:27:23 -08:00
sh
acpi-dma.c	acpi-dma: align documentation with kernel-doc format	2014-01-26 17:33:57 +05:30
amba-pl08x.c	dma: pl08x: Export pl08x_filter_id	2014-01-28 08:45:54 +05:30
at_hdmac_regs.h
at_hdmac.c
bcm2835-dma.c	dmaengine: Add DMA_PRIVATE to BCM2835 driver	2014-01-20 12:31:50 +05:30
coh901318_lli.c
coh901318.c
coh901318.h
cppi41.c	drivers/dma: fix error return code	2014-01-20 14:58:03 +05:30
dma-jz4740.c
dmaengine.c	ARM: SoC cleanups for 3.14	2014-01-23 18:36:55 -08:00
dmaengine.h
dmatest.c	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-01-29 20:27:23 -08:00
edma.c
ep93xx_dma.c
fsldma.c
fsldma.h	DMA: Freescale: change BWC from 256 bytes to 1024 bytes	2014-01-20 13:13:22 +05:30
imx-dma.c
imx-sdma.c	dma: imx-sdma: Assign a default script number for ROM firmware cases	2014-01-13 14:52:04 +05:30
intel_mid_dma_regs.h
intel_mid_dma.c
iop-adma.c
iovlock.c
k3dma.c	dmaengine: k3dma: fix sparse warnings	2014-01-20 13:53:20 +05:30
Kconfig	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-01-29 20:27:23 -08:00
Makefile	dmaengine: Add MOXA ART DMA engine driver	2014-01-20 12:32:46 +05:30
mmp_pdma.c	dmaengine: mmp_pdma: fix mismerge	2014-01-29 17:38:57 +05:30
mmp_tdma.c	dma:mmp_tdma: get sram pool through device tree	2014-01-09 17:46:20 +05:30
moxart-dma.c	dmaengine: Add MOXA ART DMA engine driver	2014-01-20 12:32:46 +05:30
mpc512x_dma.c
mv_xor.c
mv_xor.h
mxs-dma.c
of-dma.c
omap-dma.c	dma: omap: Set debug level to debugging messages	2014-01-20 14:56:25 +05:30
pch_dma.c
pl330.c	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-01-29 20:27:23 -08:00
s3c24xx-dma.c
sa11x0-dma.c
sirf-dma.c	dmaengine: sirf: Add device_slave_caps interface	2014-01-20 13:17:31 +05:30
ste_dma40_ll.c
ste_dma40_ll.h
ste_dma40.c
tegra20-apb-dma.c	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-01-29 20:27:23 -08:00
timb_dma.c
TODO
txx9dmac.c
txx9dmac.h
virt-dma.c
virt-dma.h	dma: fix vchan_cookie_complete() debug print	2014-01-26 17:33:45 +05:30