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-11-01 20:16:43 -07:00
2012-01-17 18:40:24 -08:00
2011-03-29 14:47:58 +02:00
2010-06-30 09:00:28 +02:00
2011-08-26 10:02:28 +02:00
2011-11-04 03:54:17 +08:00
2010-07-26 14:17:57 +02:00
2011-08-26 08:50:58 +02:00
2011-12-19 12:26:05 +01:00
2011-11-01 20:11:00 -07:00
2011-05-23 18:04:51 +01:00
2011-07-07 09:07:33 +02:00
2010-12-15 12:42:49 +01:00
2010-10-19 18:44:57 +02:00
2011-09-23 08:32:14 +02:00
2011-09-23 08:32:14 +02:00
2011-12-19 13:46:11 +00:00
2011-11-15 18:13:59 +00:00
2011-12-19 12:25:35 +01:00
2011-04-12 09:48:10 +02:00
2012-01-05 12:57:15 +00:00
2011-12-18 23:00:26 +00:00
2011-12-25 12:02:28 +08:00
2011-03-07 19:29:41 +01:00