Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits) ARM: mach-shmobile: specify CHCLR registers on SH7372 dma: shdma: fix runtime PM: clear channel buffers on reset dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit dmaengine/ste_dma40: clear LNK on channel startup dmaengine: intel_mid_dma: remove legacy pm interface ASoC: mxs: correct 'direction' of device_prep_dma_cyclic dmaengine: intel_mid_dma: error path fix dmaengine: intel_mid_dma: locking and freeing fixes mtd: gpmi-nand: move to dma_transfer_direction mtd: fix compile error for gpmi-nand mmc: mxs-mmc: fix the dma_transfer_direction migration dmaengine: add DMA_TRANS_NONE to dma_transfer_direction dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled. dma: mxs-dma: fix a typo in comment DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove video i.MX IPU: Fix display connections i.MX IPU DMA: Fix wrong burstsize settings dmaengine/ste_dma40: allow fixed physical channel ... Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c} The conflicts looked pretty trivial, but I'll ask people to verify them.		2012-01-17 18:40:24 -08:00
..
dma-sh7760.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00
fsi-ak4642.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
fsi-da7210.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
fsi-hdmi.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00:00
fsi.c	ASoC: Use core pm_runtime callbacks for fsi	2011-12-15 02:27:00 +08:00
hac.c	ASoC: Convert sh directory to module_platform_driver	2011-11-25 13:15:29 +00:00
Kconfig	ASoC: sh: fsi: modify improper dependent	2010-12-21 23:22:47 +00:00
Makefile	ASoC: fsi-codec: Add FSI - HDMI support	2010-09-01 11:18:09 +01:00
migor.c	ASoC: sh: Add .owner to struct snd_soc_card	2011-12-23 11:32:07 +00: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	sound-soc: move to dma_transfer_direction	2011-10-31 09:40:27 +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