Linus Torvalds c511dc1fb6 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine update from Vinod Koul: "This time we have a new dmaengine driver from the tegra folks. Also we have Guennadi's cleanup of sh drivers which incudes a library for sh drivers. And the usual odd fixes in bunch of drivers and some nice cleanup of dw_dmac from Andy." Fix up conflicts in drivers/mmc/host/sh_mmcif.c * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits) dmaengine: Cleanup logging messages mmc: sh_mmcif: switch to the new DMA channel allocation and configuration dma: sh: provide a migration path for slave drivers to stop using .private dma: sh: use an integer slave ID to improve API compatibility dmaengine: shdma: prepare to stop using struct dma_chan::private sh: remove unused DMA device pointer from SIU platform data ASoC: siu: don't use DMA device for channel filtering dmaengine: shdma: (cosmetic) simplify a static function dmaengine: at_hdmac: add a few const qualifiers dw_dmac: use 'u32' for LLI structure members, not dma_addr_t dw_dmac: mark dwc_dump_lli inline dma: mxs-dma: Export missing symbols from mxs-dma.c dma: shdma: convert to the shdma base library ASoC: fsi: prepare for conversion to the shdma base library usb: renesas_usbhs: prepare for conversion to the shdma base library ASoC: siu: prepare for conversion to the shdma base library serial: sh-sci: prepare for conversion to the shdma base library mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion dma: shdma: prepare for conversion to the shdma base library ...		2012-07-24 17:12:54 -07:00
..
aoa	sound/aoa: Adapt to new i2c probing scheme	2012-07-11 18:22:48 +10:00
arm	ALSA: convert PM ops of platform_driver to new pm ops	2012-07-03 07:58:19 +02:00
atmel	ALSA: convert PM ops of platform_driver to new pm ops	2012-07-03 07:58:19 +02:00
core	Merge branch 'topic/misc' into for-next	2012-07-18 13:53:29 +02:00
drivers	ALSA: Convert to new pm_ops for PCI drivers	2012-07-03 08:23:03 +02:00
firewire
i2c
isa	ALSA: opti9xx: Fix section mismatch by PM support	2012-07-17 12:15:49 +02:00
mips
oss	Sound update for 3.6-rc1	2012-07-24 13:37:37 -07:00
parisc
pci	ALSA: hda - add dock support for Thinkpad X230 Tablet	2012-07-20 10:45:07 +02:00
pcmcia	ALSA: pdaudiocf: Remove superfluous pm_message_t argument from suspend	2012-07-03 08:23:08 +02:00
ppc	ALSA: convert PM ops of platform_driver to new pm ops	2012-07-03 07:58:19 +02:00
sh	ALSA: Add missing .owner=THIS_MODULE to platform_driver definitions	2012-07-02 17:50:05 +02:00
soc	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-07-24 17:12:54 -07:00
sparc
spi
synth
usb	Merge branch 'topic/misc' into for-next	2012-07-18 13:53:29 +02:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c