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 5115f3c19d Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine updates from Vinod Koul: "This is fairly big pull by my standards as I had missed last merge window. So we have the support for device tree for slave-dmaengine, large updates to dw_dmac driver from Andy for reusing on different architectures. Along with this we have fixes on bunch of the drivers" Fix up trivial conflicts, usually due to #include line movement next to each other. * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits) Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" ARM: dts: pl330: Add #dma-cells for generic dma binding support DMA: PL330: Register the DMA controller with the generic DMA helpers DMA: PL330: Add xlate function DMA: PL330: Add new pl330 filter for DT case. dma: tegra20-apb-dma: remove unnecessary assignment edma: do not waste memory for dma_mask dma: coh901318: set residue only if dma is in progress dma: coh901318: avoid unbalanced locking dmaengine.h: remove redundant else keyword dma: of-dma: protect list write operation by spin_lock dmaengine: ste_dma40: do not remove descriptors for cyclic transfers dma: of-dma.c: fix memory leakage dw_dmac: apply default dma_mask if needed dmaengine: ioat - fix spare sparse complain dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING dw_dmac: add support for Lynxpoint DMA controllers dw_dmac: return proper residue value dw_dmac: fill individual length of descriptor ...		12 years ago
..
include/mach	Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup	12 years ago
Kconfig	…
Makefile	…
Makefile.boot	…
clock.c	ARM: S3C64XX: make regs-sys.h local	12 years ago
common.c	irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h	12 years ago
common.h	…
cpuidle.c	ARM: S3C64XX: Fix missing header error with CONFIG_CPU_IDLE enabled	12 years ago
crag6410.h	ARM: S3C64XX: make crag6410.h local	12 years ago
dev-audio.c	ARM: S3C64XX: Add I2S clkdev support	12 years ago
dev-uart.c	…
dma.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	12 years ago
irq-pm.c	…
mach-anw6410.c	Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup	12 years ago
mach-crag6410-module.c	Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup	12 years ago
mach-crag6410.c	Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup	12 years ago
mach-hmt.c	Initial irqchip init infrastructure and GIC and VIC clean-ups	12 years ago
mach-mini6410.c	Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup	12 years ago
mach-ncp.c	Initial irqchip init infrastructure and GIC and VIC clean-ups	12 years ago
mach-real6410.c	Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup	12 years ago
mach-smartq.c	ARM: S3C64XX: make regs-modem.h local	12 years ago
mach-smartq.h	…
mach-smartq5.c	Initial irqchip init infrastructure and GIC and VIC clean-ups	12 years ago
mach-smartq7.c	Initial irqchip init infrastructure and GIC and VIC clean-ups	12 years ago
mach-smdk6400.c	Initial irqchip init infrastructure and GIC and VIC clean-ups	12 years ago
mach-smdk6410.c	Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup	12 years ago
pm.c	arm-soc: cleanups	12 years ago
regs-gpio-memport.h	ARM: S3C64XX: make regs-gpio-memport.h local	12 years ago
regs-modem.h	ARM: S3C64XX: make regs-modem.h local	12 years ago
regs-srom.h	ARM: S3C64XX: make regs-srom.h local	12 years ago
regs-sys.h	ARM: S3C64XX: make regs-sys.h local	12 years ago
regs-syscon-power.h	ARM: S3C64XX: make regs-syscon-power.h local	12 years ago
s3c6400.c	…
s3c6410.c	…
setup-fb-24bpp.c	…
setup-i2c0.c	…
setup-i2c1.c	…
setup-ide.c	…
setup-keypad.c	…
setup-sdhci-gpio.c	…
setup-spi.c	…
setup-usb-phy.c	ARM: S3C64XX: make regs-sys.h local	12 years ago
sleep.S	…