summaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2013-06-25 23:34:29 +0200
committerJoerg Roedel <joro@8bytes.org>2013-06-25 23:34:29 +0200
commit01ce784acfa69a171afe6ec3f85a959546f2d18a (patch)
tree7f028d92a3332a1d708dfba64cb5d7a41a0f8359 /drivers/iommu
parentc14d26905d256565052dce99c35b02470162e679 (diff)
parentb6c2e09f74a1f95aa77b478b40b41538a2ccb8f0 (diff)
parent6197ca8272d16b0c7f95764a2c88eb976347e38b (diff)
parent60d0ca3cfd199b6612bbbbf4999a3470dad38bb1 (diff)
parentb8f9879ea9d9b697f8864f219ad98c5779e6ee04 (diff)
Merge branches 'x86/vt-d', 'arm/omap', 'core', 'x86/amd' and 'arm/smmu' into next