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-13 09:32:20 +10:30
2012-01-13 09:32:20 +10:30
2012-01-08 13:10:57 -08:00
2012-01-17 20:50:53 -05:00
2012-01-13 09:32:20 +10:30
2012-01-16 15:02:30 -08:00
2012-01-15 12:48:41 -08:00
2012-01-13 09:32:20 +10:30
2012-01-14 15:07:24 -08:00
2012-01-16 18:23:09 -08:00
2012-01-06 18:15:25 -08:00
2012-01-11 18:53:33 -08:00
2012-01-10 22:01:27 -08:00
2012-01-17 18:40:24 -08:00
2012-01-13 09:32:20 +10:30
2012-01-13 09:32:20 +10:30
2012-01-12 11:53:55 -05:00
2012-01-14 13:25:23 -08:00
2012-01-13 09:09:15 +00:00
2012-01-13 09:32:20 +10:30
2012-01-09 12:09:47 -08:00
2012-01-16 22:51:48 +01:00
2012-01-14 13:05:21 -08:00
2012-01-14 15:07:24 -08:00
2012-01-13 09:32:20 +10:30
2012-01-14 12:32:16 -08:00
2012-01-10 11:08:21 -08:00
2012-01-14 12:32:16 -08:00
2012-01-14 12:32:16 -08:00
2012-01-12 15:44:47 +10:30
2012-01-13 09:32:20 +10:30
2012-01-15 12:24:45 -08:00
2012-01-17 18:40:24 -08:00
2012-01-13 09:32:20 +10:30
2012-01-10 10:36:08 -08:00
2012-01-14 12:32:16 -08:00
2012-01-17 18:40:24 -08:00
2012-01-17 18:40:24 -08:00
2012-01-17 18:40:24 -08:00
2012-01-17 18:40:24 -08:00
2012-01-07 12:03:30 -08:00
2012-01-14 13:25:55 -08:00
2012-01-06 08:02:58 -08:00
2012-01-11 18:50:26 -08:00
2012-01-14 12:32:16 -08:00
2012-01-14 18:36:33 -08:00
2012-01-14 13:05:21 -08:00
2012-01-13 09:32:20 +10:30
2012-01-06 12:11:20 -08:00
2012-01-13 09:32:20 +10:30
2012-01-13 20:43:32 -08:00
2012-01-13 20:43:32 -08:00
2012-01-13 09:32:20 +10:30
2012-01-15 12:24:45 -08:00
2012-01-11 23:29:20 -08:00
2012-01-17 18:40:24 -08:00
2012-01-15 12:49:56 -08:00
2012-01-17 18:40:24 -08:00
2012-01-11 18:50:26 -08:00
2012-01-17 18:40:24 -08:00
2012-01-09 12:09:47 -08:00
2012-01-17 18:40:24 -08:00
2012-01-12 15:44:47 +10:30
2012-01-13 09:32:20 +10:30
2012-01-17 11:56:29 -08:00
2012-01-11 23:58:47 -05:00