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 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()		13 years ago
..
arm-pl330.txt	ARM: highbank: add coherent DMA setup	13 years ago
atmel-dma.txt	…
fsl-imx-sdma.txt	…
fsl-mxs-dma.txt	dma: mxs-dma: add device tree probe support	13 years ago
mmp-dma.txt	ARM: dt: mmp-dma: add binding file	13 years ago
snps-dma.txt	dmaengine: dw_dma: add Device Tree probing capability	13 years ago
tegra20-apbdma.txt	ARM: dt: tegra: Add Tegra APB DMA device tree binding	13 years ago