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
..
Makefile	…
dca.c	Drivers: dma: remove __dev* attributes.	12 years ago
dma.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	12 years ago
dma.h	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	12 years ago
dma_v2.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	12 years ago
dma_v2.h	Drivers: dma: remove __dev* attributes.	12 years ago
dma_v3.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	12 years ago
hw.h	ioat: Add alignment workaround for IVB platforms	12 years ago
pci.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	12 years ago
registers.h	…