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
..
aoa
arm	ALSA: AACI: Convert to modern PM ops	2013-12-03 17:43:42 +01:00
atmel	Merge branch 'for-linus' into for-next	2013-12-16 15:53:52 +01:00
core	Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai	2014-01-16 12:42:57 +00:00
drivers
firewire	ALSA: dice: fix array limits in dice_proc_read()	2013-11-29 10:23:04 +01:00
i2c
isa
mips
oss	sound: oss: remove last sleep_on users	2014-01-14 16:12:07 +01:00
parisc
pci	ALSA: hda - add headset mic detect quirks for some Dell machines	2014-01-16 12:43:15 +01:00
pcmcia
ppc	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
sh
soc	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-01-29 20:27:23 -08:00
sparc
spi	ALSA: at73c213: clk_round_rate() can return a zero upon error	2013-12-10 21:19:47 +01:00
synth
usb	ALSA: snd-usb: re-order some quirk entries	2014-01-14 14:40:08 +01:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c