summaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2012-10-02 14:40:03 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2012-10-02 14:40:03 +0200
commit009487258399cb4f431992919fa0f386d1b74ceb (patch)
tree6e6bdafb4fa93a455c409bf9087fc60661cf464d /drivers/iommu
parent759643ce39f13c416236e2609ccaed9792107b2f (diff)
parente6bc59330e34626082a6b2e4733802e372781c8d (diff)
parentf8ffcc9279f90ba3790c6dc0f01207ad6ea1c8df (diff)
parent500c25edda62a5d39c4d3b345c2e229a3f9d26be (diff)
parent2e12bc29fc5a12242d68e11875db3dd58efad9ff (diff)
parent44229b13bd74514ace76f7df40b388820a237288 (diff)
Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next
Conflicts: drivers/iommu/amd_iommu_init.c