summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS9
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c55f690d4030..645a9f85f33f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -601,6 +601,15 @@ W: http://linuxtv.org
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
S: Maintained
+CALGARY x86-64 IOMMU
+P: Muli Ben-Yehuda
+M: muli@il.ibm.com
+P: Jon D. Mason
+M: jdmason@us.ibm.com
+L: linux-kernel@vger.kernel.org
+L: discuss@x86-64.org
+S: Maintained
+
COMMON INTERNET FILE SYSTEM (CIFS)
P: Steve French
M: sfrench@samba.org