summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/amd_iommu.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2011-06-21 11:14:10 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2011-06-21 11:14:10 +0200
commit801019d59d4e1d1523e5897949fd3b6843571bd0 (patch)
tree398a934d23eb28d3e555d5938c8abe52152fcd2f /drivers/iommu/amd_iommu.c
parentLinux 3.0-rc4 (diff)
parentx86/amd-iommu: Store device alias as dev_data pointer (diff)
parentiommu/amd: Move missing parts to drivers/iommu (diff)
downloadlinux-801019d59d4e1d1523e5897949fd3b6843571bd0.tar.xz
linux-801019d59d4e1d1523e5897949fd3b6843571bd0.zip
Merge branches 'amd/transparent-bridge' and 'core'
Conflicts: arch/x86/include/asm/amd_iommu_types.h arch/x86/kernel/amd_iommu.c Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>