summaryrefslogtreecommitdiff
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
parentc6a21d0b8d667f403bc6186ef215a504a26ab682 (diff)
parent5e1b612cb16f446996398bd23b6cd59ea0206938 (diff)
parent9e28547f887c3040747d8422e1feef79bea93bd8 (diff)
parent85410340e0d0224c78c7d40a3ac7e1b3e9670cf1 (diff)
Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2