1 files changed, 46 insertions, 35 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 36c7bc641dba..0f95a4a787a6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -767,14 +767,14 @@ S:	Maintained
 
 BLACKFIN ARCHITECTURE
 P:      Bryan Wu
-M:      bryan.wu@analog.com
+M:      cooloney@kernel.org
 L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 W:      http://blackfin.uclinux.org
 S:      Supported
 
 BLACKFIN EMAC DRIVER
 P:      Bryan Wu
-M:      bryan.wu@analog.com
+M:      cooloney@kernel.org
 L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 W:      http://blackfin.uclinux.org
 S:      Supported
@@ -982,6 +982,12 @@ M:	mchan@broadcom.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
+BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
+P:      Eliezer Tamir
+M:      eliezert@broadcom.com
+L:      netdev@vger.kernel.org
+S:      Supported
+
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 P:      Michael Chan
 M:      mchan@broadcom.com
@@ -1132,6 +1138,12 @@ L:	accessrunner-general@lists.sourceforge.net
 W:      http://accessrunner.sourceforge.net/
 S:      Maintained
 
+CONTROL GROUPS (CGROUPS)
+P:      Paul Menage
+M:      menage@google.com
+L:      containers@lists.linux-foundation.org
+S:      Maintained
+
 CORETEMP HARDWARE MONITORING DRIVER
 P:      Rudolf Marek
 M:      r.marek@assembler.cz
@@ -1583,6 +1595,13 @@ L:	linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://linux-fbdev.sourceforge.net/
 S:      Maintained
 
+FREESCALE DMA DRIVER
+P;      Zhang Wei
+M:      wei.zhang@freescale.com
+L:      linuxppc-embedded@ozlabs.org
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 FREESCALE SOC FS_ENET DRIVER
 P:      Pantelis Antoniou
 M:      pantelis.antoniou@gmail.com
@@ -2033,43 +2052,19 @@ M:	kernel@wantstofly.org
 L:      netdev@vger.kernel.org
 S:      Maintained
 
-INTEL PRO/100 ETHERNET SUPPORT
-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:      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
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
 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:      Bruce Allan
+M:      bruce.w.allan@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/10GbE SUPPORT
-P:      Ayyappan Veeraiyan
-M:      ayyappan.veeraiyan@intel.com
-P:      Auke Kok
-M:      auke-jan.h.kok@intel.com
-P:      Jesse Brandeburg
-M:      jesse.brandeburg@intel.com
-P:      John Ronciak
-M:      john.ronciak@intel.com
-L:      e1000-devel@lists.sourceforge.net
-W:      http://sourceforge.net/projects/e1000/
+W:      http://e1000.sourceforge.net/
 S:      Supported
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
@@ -2137,7 +2132,7 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 
 IPATH DRIVER:
-P:      Arthur Jones
+P:      Ralph Campbell
 M:      infinipath@qlogic.com
 L:      general@lists.openfabrics.org
 T:      git git://git.qlogic.com/ipath-linux-2.6
@@ -2620,6 +2615,17 @@ L:	linux-kernel@vger.kernel.org
 W:      http://www.linux-mm.org
 S:      Maintained
 
+MEMORY RESOURCE CONTROLLER
+P:      Balbir Singh
+M:      balbir@linux.vnet.ibm.com
+P:      Pavel Emelyanov
+M:      xemul@openvz.org
+P:      KAMEZAWA Hiroyuki
+M:      kamezawa.hiroyu@jp.fujitsu.com
+L:      linux-mm@kvack.org
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 MEI MN10300/AM33 PORT
 P:      David Howells
 M:      dhowells@redhat.com
@@ -2744,6 +2750,8 @@ S:	Maintained
 NETEFFECT IWARP RNIC DRIVER (IW_NES)
 P:      Faisal Latif
 M:      flatif@neteffect.com
+P:      Nishi Gupta
+M:      ngupta@neteffect.com
 P:      Glenn Streiff
 M:      gstreiff@neteffect.com
 L:      general@lists.openfabrics.org
@@ -3884,10 +3892,13 @@ M:	trivial@kernel.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-TULIP NETWORK DRIVER
-L:      tulip-users@lists.sourceforge.net
-W:      http://sourceforge.net/projects/tulip/
-S:      Orphan
+TULIP NETWORK DRIVERS
+P:      Grant Grundler
+M:      grundler@parisc-linux.org
+P:      Kyle McMartin
+M:      kyle@parisc-linux.org
+L:      netdev@vger.kernel.org
+S:      Maintained
 
 TUN/TAP driver
 P:      Maxim Krasnyansky