Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 79c711e6074bb763b483a747e24386585c35571b..2340cfb1e25d3d361e7fab799f23249fc124a245 100644 (file)
--- 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
@@ -1919,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
@@ -1984,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
@@ -2741,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
@@ -3613,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