Auto-update from upstream

1 files changed, 37 insertions, 13 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 07fd0a23379c..a01b20ef7e8a 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
@@ -650,6 +662,11 @@ L:	linux-crypto@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
 S:      Maintained
 
+CS5535 Audio ALSA driver
+P:      Jaya Kumar
+M:      jayakumar.alsa@gmail.com
+S:      Maintained
+
 CYBERPRO FB DRIVER
 P:      Russell King
 M:      rmk@arm.linux.org.uk
@@ -1225,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
@@ -1235,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
@@ -1465,7 +1482,6 @@ P:	Several
 L:      kernel-janitors@osdl.org
 W:      http://www.kerneljanitors.org/
 W:      http://sf.net/projects/kernel-janitor/
-W:      http://developer.osdl.org/rddunlap/kj-patches/
 S:      Maintained
 
 KERNEL NFSD
@@ -1476,17 +1492,11 @@ W:	http://nfs.sourceforge.net/
 W:      http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
 S:      Maintained
 
-KERNEL EVENT LAYER (KOBJECT_UEVENT)
-P:      Robert Love
-M:      rml@novell.com
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
 KEXEC
 P:      Eric Biederman
 P:      Randy Dunlap
 M:      ebiederm@xmission.com
-M:      rddunlap@osdl.org
+M:      rdunlap@xenotime.net
 W:      http://www.xmission.com/~ebiederm/files/kexec/
 L:      linux-kernel@vger.kernel.org
 L:      fastboot@osdl.org
@@ -1900,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
@@ -2587,7 +2606,6 @@ S:	Maintained
 UDF FILESYSTEM
 P:      Ben Fennema
 M:      bfennema@falcon.csc.calpoly.edu
-L:      linux_udf@hpesjro.fc.hp.com
 W:      http://linux-udf.sourceforge.net
 S:      Maintained
 
@@ -2640,6 +2658,12 @@ L:	linux-usb-users@lists.sourceforge.net
 L:      linux-usb-devel@lists.sourceforge.net
 S:      Maintained
 
+USB ISP116X DRIVER
+P:      Olav Kongas
+M:      ok@artecdesign.ee
+L:      linux-usb-devel@lists.sourceforge.net
+S:      Maintained
+
 USB KAWASAKI LSI DRIVER
 P:      Oliver Neukum
 M:      oliver@neukum.name
@@ -2651,7 +2675,7 @@ USB MASS STORAGE DRIVER
 P:      Matthew Dharm
 M:      mdharm-usb@one-eyed-alien.net
 L:      linux-usb-users@lists.sourceforge.net
-L:      linux-usb-devel@lists.sourceforge.net
+L:      usb-storage@lists.one-eyed-alien.net
 S:      Maintained
 W:      http://www.one-eyed-alien.net/~mdharm/linux-usb/