You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		13 years ago
..
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	13 years ago
dma.h	dmaengine: move drivers to dma_transfer_direction	13 years ago
entry-macro.S	ARM: ep93xx: convert to MULTI_IRQ_HANDLER	13 years ago
ep93xx-regs.h	…
ep93xx_keypad.h	…
ep93xx_spi.h	…
fb.h	…
gpio-ep93xx.h	ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics	13 years ago
gpio.h	ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>	13 years ago
hardware.h	…
io.h	…
irqs.h	…
memory.h	…
platform.h	ARM: restart: ep93xx: use new restart hook	13 years ago
system.h	ARM: restart: remove the now empty arch_reset()	13 years ago
timex.h	…
ts72xx.h	ARM: 6967/1: ep93xx: ts72xx: fix board model detection	14 years ago
uncompress.h	…