aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2011-09-06 14:59:21 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2011-09-06 14:59:21 +0200
commit51acc0bcfc91987ed38195918e0b40ff05197585 (patch)
tree04bd7bbd5cfe925600db035e41d6050cee38b139 /drivers/iommu
parentdma-debug: hash_bucket_find needs to allow for offsets within an entry (diff)
parentiommu/omap: ->unmap() should return order of unmapped page (diff)
parentiommu/msm: ->unmap() should return order of unmapped page (diff)
parentiommu/core: Use PAGE_SIZE instead of hard-coded value (diff)
downloadlinux-dev-51acc0bcfc91987ed38195918e0b40ff05197585.tar.xz
linux-dev-51acc0bcfc91987ed38195918e0b40ff05197585.zip
Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2