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