1 files changed, 24 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 16f37826ae38..554fcec48b3e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -258,6 +258,13 @@ P:	Ivan Kokshaysky
 M:      ink@jurassic.park.msu.ru
 S:      Maintained for 2.4; PCI support for 2.6.
 
+AMD GEODE PROCESSOR/CHIPSET SUPPORT
+P:      Jordan Crouse
+M:      info-linux@geode.amd.com
+L:      info-linux@geode.amd.com
+W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
+S:      Supported
+
 APM DRIVER
 P:      Stephen Rothwell
 M:      sfr@canb.auug.org.au
@@ -554,6 +561,11 @@ W:	http://us1.samba.org/samba/Linux_CIFS_client.html
 T:      git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 S:      Supported       
 
+CONFIGFS
+P:      Joel Becker
+M:      Joel Becker <joel.becker@oracle.com>
+S:      Supported
+
 CIRRUS LOGIC GENERIC FBDEV DRIVER
 P:      Jeff Garzik
 M:      jgarzik@pobox.com
@@ -1230,7 +1242,7 @@ IEEE 1394 SUBSYSTEM
 P:      Ben Collins
 M:      bcollins@debian.org
 P:      Jody McIntyre
-M:      scjody@steamballoon.com
+M:      scjody@modernduck.com
 L:      linux1394-devel@lists.sourceforge.net
 W:      http://www.linux1394.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git
@@ -1240,14 +1252,14 @@ IEEE 1394 OHCI DRIVER
 P:      Ben Collins
 M:      bcollins@debian.org
 P:      Jody McIntyre
-M:      scjody@steamballoon.com
+M:      scjody@modernduck.com
 L:      linux1394-devel@lists.sourceforge.net
 W:      http://www.linux1394.org/
 S:      Maintained
 
 IEEE 1394 PCILYNX DRIVER
 P:      Jody McIntyre
-M:      scjody@steamballoon.com
+M:      scjody@modernduck.com
 L:      linux1394-devel@lists.sourceforge.net
 W:      http://www.linux1394.org/
 S:      Maintained
@@ -1898,6 +1910,15 @@ M:	ajoshi@shell.unixbox.com
 L:      linux-nvidia@lists.surfsouth.com
 S:      Maintained
 
+ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
+P:      Mark Fasheh
+M:      mark.fasheh@oracle.com
+P:      Kurt Hackel
+M:      kurt.hackel@oracle.com
+L:      ocfs2-devel@oss.oracle.com
+W:      http://oss.oracle.com/projects/ocfs2/
+S:      Supported       
+
 OLYMPIC NETWORK DRIVER
 P:      Peter De Shrijver
 M:      p2@ace.ulyssis.student.kuleuven.ac.be