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
..
dma-sh7760.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00
fsi.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-07-24 17:12:54 -07:00
hac.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00
Kconfig	ASoC: sh: fsi: select simple-card on Kconfig	2012-04-13 11:29:28 +01:00
Makefile	ASoC: sh: fsi: use simple-card instead of fsi-da7210	2012-04-13 11:29:27 +01:00
migor.c	ASoC: sh: fix migor.c compilation	2012-05-09 12:41:05 +01:00
sh7760-ac97.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
siu_dai.c	ASoC: Use core pm_runtime callbacks for siu_dai	2011-12-15 02:26:58 +08:00
siu_pcm.c	ASoC: siu: don't use DMA device for channel filtering	2012-07-20 11:23:44 +05:30
siu.h	ASoC: Do not include soc-dai.h	2010-11-22 14:04:53 +00:00
ssi.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00