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