1 files changed, 36 insertions, 20 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3c7db6222f86..2340cfb1e25d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -665,12 +665,18 @@ S:	Maintained
 
 ATMEL AT91 MCI DRIVER
 P:      Nicolas Ferre
-M:      nicolas.ferre@rfo.atmel.com
+M:      nicolas.ferre@atmel.com
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:      http://www.atmel.com/products/AT91/
 W:      http://www.at91.com/
 S:      Maintained
 
+ATMEL LCDFB DRIVER
+P:      Nicolas Ferre
+M:      nicolas.ferre@atmel.com
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+S:      Maintained
+
 ATMEL MACB ETHERNET DRIVER
 P:      Haavard Skinnemoen
 M:      hskinnemoen@atmel.com
@@ -1870,8 +1876,10 @@ T:	quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
 S:      Maintained
 
 IDE/ATAPI CDROM DRIVER
+P:      Borislav Petkov
+M:      bbpetkov@yahoo.de
 L:      linux-ide@vger.kernel.org
-S:      Unmaintained
+S:      Maintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:      Paul Bristow
@@ -1917,7 +1925,7 @@ INFINIBAND SUBSYSTEM
 P:      Roland Dreier
 M:      rolandd@cisco.com
 P:      Sean Hefty
-M:      mshefty@ichips.intel.com
+M:      sean.hefty@intel.com
 P:      Hal Rosenstock
 M:      hal.rosenstock@gmail.com 
 L:      general@lists.openfabrics.org
@@ -1982,29 +1990,27 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 
 INTEL PRO/100 ETHERNET SUPPORT
-P:      John Ronciak
-M:      john.ronciak@intel.com
+P:      Auke Kok
+M:      auke-jan.h.kok@intel.com
 P:      Jesse Brandeburg
 M:      jesse.brandeburg@intel.com
 P:      Jeff Kirsher
 M:      jeffrey.t.kirsher@intel.com
-P:      Auke Kok
-M:      auke-jan.h.kok@intel.com
+P:      John Ronciak
+M:      john.ronciak@intel.com
 L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
 INTEL PRO/1000 GIGABIT ETHERNET SUPPORT
-P:      Jeb Cramer
-M:      cramerj@intel.com
-P:      John Ronciak
-M:      john.ronciak@intel.com
+P:      Auke Kok
+M:      auke-jan.h.kok@intel.com
 P:      Jesse Brandeburg
 M:      jesse.brandeburg@intel.com
 P:      Jeff Kirsher
 M:      jeffrey.t.kirsher@intel.com
-P:      Auke Kok
-M:      auke-jan.h.kok@intel.com
+P:      John Ronciak
+M:      john.ronciak@intel.com
 L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
@@ -2029,7 +2035,7 @@ P:	James Ketrenos
 M:      jketreno@linux.intel.com
 L:      linux-wireless@vger.kernel.org
 L:      ipw2100-devel@lists.sourceforge.net
-L:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
+W:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2100.sourceforge.net
 S:      Supported
 
@@ -2040,7 +2046,7 @@ P:	James Ketrenos
 M:      jketreno@linux.intel.com
 L:      linux-wireless@vger.kernel.org
 L:      ipw2100-devel@lists.sourceforge.net
-L:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
+W:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2200.sourceforge.net
 S:      Supported
 
@@ -2597,7 +2603,7 @@ S:	Maintained
 MSI LAPTOP SUPPORT
 P:      Lennart Poettering
 M:      mzxreary@0pointer.de
-L:      https://tango.0pointer.de/mailman/listinfo/s270-linux
+W:      https://tango.0pointer.de/mailman/listinfo/s270-linux
 W:      http://0pointer.de/lennart/tchibo.html
 S:      Maintained
 
@@ -2739,8 +2745,8 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:      Maintained
 
 NETXEN (1/10) GbE SUPPORT
-P:      Amit S. Kale
-M:      amitkale@netxen.com
+P:      Dhananjay Phadke
+M:      dhananjay@netxen.com
 L:      netdev@vger.kernel.org
 W:      http://www.netxen.com
 S:      Supported
@@ -3611,8 +3617,10 @@ L:	linux-kernel@vger.kernel.org ?
 S:      Supported
 
 SPIDERNET NETWORK DRIVER for CELL
-P:      Linas Vepstas
-M:      linas@austin.ibm.com
+P:      Ishizaki Kou
+M:      kou.ishizaki@toshiba.co.jp
+P:      Jens Osterkamp
+M:      jens@de.ibm.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
@@ -4054,6 +4062,14 @@ L:	user-mode-linux-user@lists.sourceforge.net
 W:      http://user-mode-linux.sourceforge.net
 S:      Maintained
 
+USERSPACE I/O (UIO)
+P:      Hans J. Koch
+M:      hjk@linutronix.de
+P:      Greg Kroah-Hartman
+M:      gregkh@suse.de
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 FAT/VFAT/MSDOS FILESYSTEM:
 P:      OGAWA Hirofumi
 M:      hirofumi@mail.parknet.co.jp