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