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

..

ac97.c

ASoC: Convert Samsung directory to module_platform_driver

2011-11-25 13:03:03 +00:00

dma.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-01-17 18:40:24 -08:00

dma.h

ASoC: Samsung: Update DMA interface

2011-09-14 11:10:04 +05:30

goni_wm8994.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

h1940_uda1380.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

i2s-regs.h

ASoC: SAMSUNG: Add idma related register definition

2011-06-26 12:05:23 +01:00

i2s.c

ASoC: Add trivial pm_runtime usage to Samsung DAI drivers

2011-12-23 12:08:32 +00:00

i2s.h

…

idma.c

ASoC: Fix idma build after update for channel count check

2012-01-08 23:04:28 -08:00

idma.h

ASoC: Fix __iomem annotation for IDMA registers

2011-11-29 17:28:16 +00:00

jive_wm8750.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

Kconfig

ASoC: Make SND_SOC_LITTLEMILL select MFD_WM8994

2011-12-04 01:17:05 +00:00

littlemill.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

ln2440sbc_alc650.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

lowland.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

Makefile

ASoC: Rename Speyside WM8962 to Tobermory

2011-11-30 20:49:05 +00:00

neo1973_wm8753.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

pcm.c

ASoC: Add trivial pm_runtime usage to Samsung DAI drivers

2011-12-23 12:08:32 +00:00

pcm.h

ASoC: SAMSUNG: Move PCM specific definitions into pcm.c

2011-01-10 11:38:22 +00:00

regs-i2s-v2.h

…

rx1950_uda1380.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

s3c24xx_simtec_hermes.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

s3c24xx_simtec_tlv320aic23.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

s3c24xx_simtec.c

sound: Add module.h to the previously silent sound users

2011-10-31 19:31:21 -04:00

s3c24xx_simtec.h

…

s3c24xx_uda134x.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

s3c24xx-i2s.c

ASoC: Convert Samsung directory to module_platform_driver

2011-11-25 13:03:03 +00:00

s3c24xx-i2s.h

…

s3c2412-i2s.c

ASoC: Convert Samsung directory to module_platform_driver

2011-11-25 13:03:03 +00:00

s3c2412-i2s.h

…

s3c-i2s-v2.c

ASoC: samsung: s3c-i2s-v2.c needs module.h

2011-10-03 21:34:12 +01:00

s3c-i2s-v2.h

…

smartq_wm8987.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk2443_wm9710.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_spdif.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm8580.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm8580pcm.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm8994.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm8994pcm.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

smdk_wm9713.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

spdif.c

ASoC: Convert Samsung directory to module_platform_driver

2011-11-25 13:03:03 +00:00

spdif.h

…

speyside.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00

tobermory.c

ASoC: samsung: Add .owner to struct snd_soc_card

2011-12-22 11:04:18 +00:00