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 ef08e78268 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine update from Vinod Koul: "This includes the cookie cleanup by Russell, the addition of context parameter for dmaengine APIs, more arm dmaengine driver cleanup by moving code to dmaengine, this time for imx by Javier and pl330 by Boojin along with the usual driver fixes." Fix up some fairly trivial conflicts with various other cleanups. * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits) dmaengine: imx: fix the build failure on x86_64 dmaengine: i.MX: Fix merge of cookie branch. dmaengine: i.MX: Add support for interleaved transfers. dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages. dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'. dmaengine: imx-dma: remove unused arg of imxdma_sg_next. dmaengine: imx-dma: remove internal structure. dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure. dmaengine: imx-dma: remove 'in_use' field of 'internal' structure. dmaengine: imx-dma: remove sg member from internal structure. dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function. dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function. dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function. dmaengine: imx-dma: remove dma_mode member of internal structure. dmaengine: imx-dma: remove data member from internal structure. dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c dmaengine: at_hdmac: add slave config operation dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic dmaengine/dma_slave: introduce inline wrappers dma: imx-sdma: Treat firmware messages as warnings instead of erros ...		13 years ago
..
include/plat	ARM: More SoC support updates	13 years ago
Kconfig	ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX	13 years ago
Makefile	…
adc.c	…
clock-clksrc.c	…
clock.c	ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable}	13 years ago
cpu.c	Disintegrate asm/system.h for ARM	13 years ago
dev-backlight.c	ARM: SAMSUNG: Add __init attribute to samsung_bl_set()	13 years ago
dev-uart.c	…
devs.c	Merge branch 'renesas/soc' into next/soc2	13 years ago
dma-ops.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	13 years ago
dma.c	…
init.c	…
irq-vic-timer.c	ARM: EXYNOS: add interrupt definitions for EXYNOS5250	13 years ago
pd.c	…
platformdata.c	ARM: SAMSUNG: support the second capability for samsung-soc	13 years ago
pm-check.c	…
pm-gpio.c	…
pm.c	…
pwm-clock.c	…
pwm.c	…
s3c-dma-ops.c	…
time.c	Disintegrate asm/system.h for ARM	13 years ago
wakeup-mask.c	…