Linus Torvalds ca41cc96b2 Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping ... Pull CMA and DMA-mapping updates from Marek Szyprowski: "This time the pull request is rather small, because the further redesign patches were not ready on time. This pull request consists of the patches which extend ARM DMA-mapping subsystem with support for CPU coherent (ACP) DMA busses. The first client of the new version is HighBank SATA driver. The second part of the pull request includes various cleanup for both CMA common code and ARM DMA-mapping subsystem." Fix up trivial add-add conflict due to the "dma-coherent" DT property being added next to the "calxeda,port-phys" property for the Calxeda AHCI controller. * 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: ARM: dma-mapping: Remove unsed var at arm_coherent_iommu_unmap_page ARM: highbank: add coherent DMA setup ARM: kill off arch_is_coherent ARM: add coherent iommu dma ops ARM: add coherent dma ops ARM: dma-mapping: Refrain noisy console message ARM: dma-mapping: Small logical clean up drivers: dma-contiguous: refactor dma_alloc_from_contiguous()		2012-10-02 19:13:12 -07:00
..
arm-pl330.txt	ARM: highbank: add coherent DMA setup	2012-10-02 08:58:07 +02:00
atmel-dma.txt	dmaengine: at_hdmac: add device tree support	2011-11-10 14:13:33 +05:30
fsl-imx-sdma.txt	dmaengine: imx-sdma: add device tree probe support	2011-07-27 09:31:56 +08:00
fsl-mxs-dma.txt	dma: mxs-dma: add device tree probe support	2012-05-12 13:32:18 +08:00
mmp-dma.txt	ARM: dt: mmp-dma: add binding file	2012-09-21 15:51:26 +08:00
snps-dma.txt	dmaengine: dw_dma: add Device Tree probing capability	2012-05-11 10:43:40 +05:30
tegra20-apbdma.txt	ARM: dt: tegra: Add Tegra APB DMA device tree binding	2012-02-06 18:21:20 -08:00