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