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
..
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-12-03 22:03:32 +00:00
2011-10-03 15:52:38 +00:00
2011-03-31 11:26:23 -03:00
2009-01-12 20:56:32 +01:00
2008-07-24 10:47:34 -07:00
2009-12-16 07:20:04 -08:00
2009-05-06 16:36:10 -07:00
2011-09-01 00:31:05 +00:00
2011-03-22 16:18:51 +09:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2012-01-03 16:02:55 +00:00
2010-05-25 08:07:09 -07:00
2011-03-22 16:07:32 +09:00
2011-09-27 18:08:04 +02:00
2010-02-27 18:31:16 +01:00
2010-02-27 18:31:14 +01:00
2011-11-11 16:46:18 +00:00
2011-09-14 16:40:52 +00:00
2008-04-28 08:58:41 -07:00
2011-03-31 11:26:23 -03:00
2011-10-03 15:52:22 +00:00
2010-12-21 01:05:43 +09:00
2011-12-21 02:25:21 +00:00
2011-10-03 15:52:22 +00:00
2010-05-25 08:07:09 -07:00
2011-06-24 17:14:39 +09:00
2011-03-31 11:26:23 -03:00
2010-06-16 18:05:05 +02:00
2011-10-03 15:52:22 +00:00
2011-06-24 17:14:39 +09:00
2010-02-27 18:31:13 +01:00
2011-07-04 16:02:48 +09:00