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
..
adi	ASoC: axi-{spdif,i2s}: Remove SND_DMAENGINE_PCM_FLAG_NO_RESIDUE flag	2014-01-14 21:28:39 +00:00
atmel	ARM: SoC cleanups for 3.14	2014-01-23 18:36:55 -08:00
au1x
bcm
blackfin
cirrus
codecs	Immutable branch for ASoC, as requested by Mark Brown	2014-01-21 08:23:16 +00:00
davinci
dwc
fsl	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-01-29 20:27:23 -08:00
generic	Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic/bcm2835', 'asoc/topic/docs', 'asoc/topic/fsl', 'asoc/topic/generic', 'asoc/topic/kirkwood', 'asoc/topic/mc13783', 'asoc/topic/mxs', 'asoc/topic/nuc900', 'asoc/topic/sai', 'asoc/topic/sh', 'asoc/topic/ssm2602', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl4030', 'asoc/topic/ux500', 'asoc/topic/width' and 'asoc/topic/x86' into for-tiwai	2014-01-16 12:44:01 +00:00
intel
jz4740
kirkwood	Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic/bcm2835', 'asoc/topic/docs', 'asoc/topic/fsl', 'asoc/topic/generic', 'asoc/topic/kirkwood', 'asoc/topic/mc13783', 'asoc/topic/mxs', 'asoc/topic/nuc900', 'asoc/topic/sai', 'asoc/topic/sh', 'asoc/topic/ssm2602', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl4030', 'asoc/topic/ux500', 'asoc/topic/width' and 'asoc/topic/x86' into for-tiwai	2014-01-16 12:44:01 +00:00
mxs	Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic/bcm2835', 'asoc/topic/docs', 'asoc/topic/fsl', 'asoc/topic/generic', 'asoc/topic/kirkwood', 'asoc/topic/mc13783', 'asoc/topic/mxs', 'asoc/topic/nuc900', 'asoc/topic/sai', 'asoc/topic/sh', 'asoc/topic/ssm2602', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl4030', 'asoc/topic/ux500', 'asoc/topic/width' and 'asoc/topic/x86' into for-tiwai	2014-01-16 12:44:01 +00:00
nuc900
omap
pxa
s6000	Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai	2014-01-16 12:42:57 +00:00
samsung	ASoC: samsung: Remove SND_DMAENGINE_PCM_FLAG_NO_RESIDUE flag	2014-01-14 21:28:39 +00:00
sh	Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic/bcm2835', 'asoc/topic/docs', 'asoc/topic/fsl', 'asoc/topic/generic', 'asoc/topic/kirkwood', 'asoc/topic/mc13783', 'asoc/topic/mxs', 'asoc/topic/nuc900', 'asoc/topic/sai', 'asoc/topic/sh', 'asoc/topic/ssm2602', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl4030', 'asoc/topic/ux500', 'asoc/topic/width' and 'asoc/topic/x86' into for-tiwai	2014-01-16 12:44:01 +00:00
spear
tegra	ARM: SoC cleanups for 3.14	2014-01-23 18:36:55 -08:00
txx9
ux500
Kconfig
Makefile
soc-cache.c
soc-compress.c	ASoC: compress: Add suport for DPCM into compressed audio	2014-01-17 17:56:21 +00:00
soc-core.c	Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai	2014-01-16 12:42:53 +00:00
soc-dapm.c	ASoC: dapm: Fix double prefix addition	2014-01-17 18:56:39 +00:00
soc-devres.c
soc-generic-dmaengine-pcm.c	ASoC: core: Fix possible NULL pointer dereference of pcm->config	2014-01-16 14:11:49 +00:00
soc-io.c
soc-jack.c
soc-pcm.c	Merge remote-tracking branch 'asoc/topic/compress' into asoc-next	2014-01-20 11:50:41 +00:00
soc-utils.c	Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai	2014-01-16 12:42:53 +00:00