diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 14:34:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 14:34:25 -0700 |
commit | 7474043eff6f7c20141b2f49f774d0aab6542220 (patch) | |
tree | f143f787c7ff3ee6c8fede1bd2fd60c36b328243 /arch/arm/mach-imx/imx35-dt.c | |
parent | b9f2b21a32906a47c220b5167b88869f2c90f1c4 (diff) | |
parent | 68efd7d2fb32c2606f1da318b6a851d933813f27 (diff) |
Merge branch 'for-3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA-mapping updates from Marek Szyprowski:
"This contains extension for more efficient handling of io address
space for dma-mapping subsystem for ARM architecture"
* 'for-3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
arm: dma-mapping: remove order parameter from arm_iommu_create_mapping()
arm: dma-mapping: Add support to extend DMA IOMMU mappings
Diffstat (limited to 'arch/arm/mach-imx/imx35-dt.c')
0 files changed, 0 insertions, 0 deletions