summaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2014-04-02 19:13:12 +0200
committerJoerg Roedel <joro@8bytes.org>2014-04-02 19:13:12 +0200
commite172b81222548b856ecbe59b305d2cb733d512c4 (patch)
tree67bac9445c92caed203ad4452319ed3decc7662c /drivers/iommu
parent455c6fdbd219161bd09b1165f11699d6d73de11c (diff)
parentdc03753b98e21d73699c38b208ad39d9839519ee (diff)
parenta919a018cccf999aa56d7f9adeae0525b01b7434 (diff)
parente28045ab2e2a8e27d08275bf70be33868beba8fd (diff)
parentb83544390797ce488ccc0f9e40aa2f96661f842b (diff)
parent7713ec066ae8adc49dd8daa02a73e6b60af6ee5f (diff)
Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'arm/omap', 'arm/shmobile' and 'x86/vt-d' into next