diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 10:45:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 10:45:25 -0800 |
| commit | 42a0a1b0fd343888c59afc8b243a77bcec2cc11c (patch) | |
| tree | b136c088a244be8e0970767035c93d15127e8c83 /include/linux/mlx4 | |
| parent | Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (diff) | |
| parent | ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation (diff) | |
| download | linux-dev-42a0a1b0fd343888c59afc8b243a77bcec2cc11c.tar.xz linux-dev-42a0a1b0fd343888c59afc8b243a77bcec2cc11c.zip | |
Merge branch 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA-mapping updates from Marek Szyprowski:
"This time all patches are related only to ARM DMA-mapping subsystem.
The main extension provided by this pull request is highmem support.
Besides that it contains a bunch of small bugfixes and cleanups."
* 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation
ARM: dma-mapping: Add maximum alignment order for dma iommu buffers
ARM: dma-mapping: use himem for DMA buffers for IOMMU-mapped devices
ARM: dma-mapping: add support for CMA regions placed in highmem zone
arm: dma mapping: export arm iommu functions
ARM: dma-mapping: Add arm_iommu_detach_device()
ARM: dma-mapping: Add macro to_dma_iommu_mapping()
ARM: dma-mapping: Set arm_dma_set_mask() for iommu->set_dma_mask()
ARM: iommu: Include linux/kref.h in asm/dma-iommu.h
Diffstat (limited to 'include/linux/mlx4')
0 files changed, 0 insertions, 0 deletions