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