diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-20 18:49:32 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-20 18:49:32 -1000 |
| commit | c60b689631d73be046ecbe9fc3248252ba18b41f (patch) | |
| tree | 3c992199e7320151394616e9da9ea3dfcb8bc0df /MAINTAINERS | |
| parent | ca6215dfc7d09809b97f2d6af0535d7836cbb966 (diff) | |
| parent | 3da4af0affbb797e8ac4c2b4598da0c34b8cc52a (diff) | |
| download | linux-stable-c60b689631d73be046ecbe9fc3248252ba18b41f.tar.gz linux-stable-c60b689631d73be046ecbe9fc3248252ba18b41f.tar.bz2 linux-stable-c60b689631d73be046ecbe9fc3248252ba18b41f.zip | |
Merge tag 'iommu-fixes-v3.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
"Some fixes and a MAINTAINERS update to remove my lost AMD email
address from the file. The fixes take care of a resource leak and a
problem on VT-d with the new IOMMU group code."
* tag 'iommu-fixes-v3.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
intel-iommu: Fix lookup in add device
iommu/tegra-smmu.c: fix dentry reference leak in smmu_debugfs_stats_show().
iommu/amd: Update MAINTAINERS entry
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bb0b27db673f..0f043a729855 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -526,10 +526,10 @@ F: drivers/video/geode/ F: arch/x86/include/asm/geode.h AMD IOMMU (AMD-VI) -M: Joerg Roedel <joerg.roedel@amd.com> +M: Joerg Roedel <joro@8bytes.org> L: iommu@lists.linux-foundation.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git -S: Supported +S: Maintained F: drivers/iommu/amd_iommu*.[ch] F: include/linux/amd-iommu.h |