summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-09 08:08:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-09 08:08:14 -0800
commit592d44a5f8458892c007c61b9cfa677efede5e1e (patch)
treecec376faf5dd25e1ce89134b0503d8354e473392 /MAINTAINERS
parent3ab345fc4b95a981a83f616487bbe07ddb5b1b1a (diff)
parentb2c1639135c0fc1560f3fe9a3a83f2c8265a9e02 (diff)
downloadlinux-stable-592d44a5f8458892c007c61b9cfa677efede5e1e.tar.gz
linux-stable-592d44a5f8458892c007c61b9cfa677efede5e1e.tar.bz2
linux-stable-592d44a5f8458892c007c61b9cfa677efede5e1e.zip
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: MAINTAINERS: Update amd-iommu F: patterns iommu/amd: Fix typo in kernel-parameters.txt iommu/msm: Fix compile error in mach-msm/devices-iommu.c Fix comparison using wrong pointer variable in dma debug code
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6751a36f569f..b9db108f01c8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -511,8 +511,8 @@ M: Joerg Roedel <joerg.roedel@amd.com>
L: iommu@lists.linux-foundation.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
S: Supported
-F: arch/x86/kernel/amd_iommu*.c
-F: arch/x86/include/asm/amd_iommu*.h
+F: drivers/iommu/amd_iommu*.[ch]
+F: include/linux/amd-iommu.h
AMD MICROCODE UPDATE SUPPORT
M: Andreas Herrmann <andreas.herrmann3@amd.com>