linux/sound/soc/ep93xx
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
..
edb93xx.c ASoC: ep93xx: Add .owner to struct snd_soc_card 2011-12-22 17:34:35 +00:00
ep93xx-ac97.c ASoC: Convert ep93xx directory to module_platform_driver 2011-11-24 10:43:59 +00:00
ep93xx-i2s.c ASoC: Convert ep93xx directory to module_platform_driver 2011-11-24 10:43:59 +00:00
ep93xx-pcm.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
ep93xx-pcm.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
Kconfig ASoC: EDB93xx machine sound driver with CS4271 2011-01-24 12:05:15 +00:00
Makefile ASoC: EDB93xx machine sound driver with CS4271 2011-01-24 12:05:15 +00:00
simone.c ASoC: ep93xx: Add .owner to struct snd_soc_card 2011-12-22 17:34:35 +00:00
snappercl15.c ASoC: ep93xx: Add .owner to struct snd_soc_card 2011-12-22 17:34:35 +00:00