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-26 10:11:25 -04:00
2011-10-27 20:53:43 +05:30
2011-11-15 18:14:03 +00:00
2010-01-13 00:37:16 -08:00
2011-06-08 15:46:12 -06:00
2011-06-10 23:27:06 -06:00
2009-09-23 07:39:51 -07:00
2011-10-01 23:37:34 +01:00
2011-10-17 23:00:03 +01:00
2011-07-12 11:19:28 -05:00
2009-11-24 10:04:17 +00:00
2008-08-07 09:55:48 +01:00
2011-02-17 23:26:55 +00:00
2012-01-05 12:57:10 +00:00
2012-01-05 12:57:22 +00:00
2008-08-07 09:55:48 +01:00
2011-08-15 11:58:59 +01:00
2008-10-03 11:03:39 +01:00