57f2685c16
* '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.
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| spi-altera.c | ||
| spi-ath79.c | ||
| spi-atmel.c | ||
| spi-au1550.c | ||
| spi-bfin5xx.c | ||
| spi-bfin-sport.c | ||
| spi-bitbang-txrx.h | ||
| spi-bitbang.c | ||
| spi-butterfly.c | ||
| spi-coldfire-qspi.c | ||
| spi-davinci.c | ||
| spi-dw-mid.c | ||
| spi-dw-mmio.c | ||
| spi-dw-pci.c | ||
| spi-dw.c | ||
| spi-dw.h | ||
| spi-ep93xx.c | ||
| spi-fsl-espi.c | ||
| spi-fsl-lib.c | ||
| spi-fsl-lib.h | ||
| spi-fsl-spi.c | ||
| spi-gpio.c | ||
| spi-imx.c | ||
| spi-lm70llp.c | ||
| spi-mpc52xx-psc.c | ||
| spi-mpc52xx.c | ||
| spi-mpc512x-psc.c | ||
| spi-nuc900.c | ||
| spi-oc-tiny.c | ||
| spi-omap2-mcspi.c | ||
| spi-omap-100k.c | ||
| spi-omap-uwire.c | ||
| spi-orion.c | ||
| spi-pl022.c | ||
| spi-ppc4xx.c | ||
| spi-pxa2xx-pci.c | ||
| spi-pxa2xx.c | ||
| spi-s3c24xx-fiq.h | ||
| spi-s3c24xx-fiq.S | ||
| spi-s3c24xx.c | ||
| spi-s3c64xx.c | ||
| spi-sh-msiof.c | ||
| spi-sh-sci.c | ||
| spi-sh.c | ||
| spi-stmp.c | ||
| spi-tegra.c | ||
| spi-ti-ssp.c | ||
| spi-tle62x0.c | ||
| spi-topcliff-pch.c | ||
| spi-txx9.c | ||
| spi-xilinx.c | ||
| spi.c | ||
| spidev.c | ||