aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci/intel-iommu.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2011-05-10 10:25:23 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2011-05-10 10:25:23 +0200
commit604c307bf47350c74bb36507b86a08726c7c2075 (patch)
tree74a04255ea9105c3b29e3e9dfcacf66db984c7ee /drivers/pci/intel-iommu.c
parente969687595c27e02e02be0c9363261826123ba77 (diff)
parentba4b87ad5497cba555954885db99c99627f93748 (diff)
parentfd7b5535e10ce820f030842da3f289f80ec0d4f3 (diff)
parent58fc7f1419560efa9c426b829c195050e0147d7f (diff)
downloadlinux-linaro-stable-604c307bf47350c74bb36507b86a08726c7c2075.tar.gz
Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and 'amd-iommu/extended-features' into iommu/2.6.40
Conflicts: arch/x86/include/asm/amd_iommu_types.h arch/x86/kernel/amd_iommu.c arch/x86/kernel/amd_iommu_init.c