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 ...		2013-02-26 09:24:48 -08:00
..
arm_timer.h
cache-l2x0.h	ARM: 7547/4: cache-l2x0: add support for Aurora L2 cache ctrl	2012-11-06 19:47:35 +00:00
cache-tauros2.h	ARM: cache: add extra feature enable for tauros2	2012-08-16 16:16:27 +08:00
coresight.h	ARM: coresight: common definition for (OS) Lock Access Register key value	2013-01-10 21:13:05 +00:00
debug-8250.S
debug-pl01x.S
dec21285.h
entry-macro-iomd.S
icst.h
ioc.h
iomd.h
iop3xx-adma.h
iop3xx-gpio.h
iop3xx.h	ARM: iop3xx: use fixed PCI i/o mapping	2012-07-26 09:10:04 -05:00
iop_adma.h
it8152.h
locomo.h
memc.h
pci_v3.h
sa1111.h
scoop.h
ssp.h
timer-sp.h