Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 04c0dd8..27af9c9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2760,7 +2760,7 @@ F:        fs/freevxfs/
 FREEZER
 M:     Pavel Machek <pavel@ucw.cz>
 M:     "Rafael J. Wysocki" <rjw@sisk.pl>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/power/freezing-of-tasks.txt
 F:     include/linux/freezer.h
@@ -3022,7 +3022,7 @@ F:        drivers/video/hgafb.c
 HIBERNATION (aka Software Suspend, aka swsusp)
 M:     Pavel Machek <pavel@ucw.cz>
 M:     "Rafael J. Wysocki" <rjw@sisk.pl>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     arch/x86/power/
 F:     drivers/base/power/
@@ -3217,7 +3217,7 @@ F:        drivers/ide/ide-cd*
 
 IDLE-I7300
 M:     Andy Henroid <andrew.d.henroid@intel.com>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     drivers/idle/i7300_idle.c
 
@@ -3300,7 +3300,7 @@ F:        firmware/isci/
 
 INTEL IDLE DRIVER
 M:     Len Brown <lenb@kernel.org>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
 S:     Supported
 F:     drivers/idle/intel_idle.c
@@ -3397,7 +3397,7 @@ F:        drivers/net/ethernet/intel/
 
 INTEL MRST PMU DRIVER
 M:     Len Brown <len.brown@intel.com>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     arch/x86/platform/mrst/pmu.*
 
@@ -6171,7 +6171,7 @@ S:        Maintained
 
 STAGING SUBSYSTEM
 M:     Greg Kroah-Hartman <gregkh@suse.de>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 L:     devel@driverdev.osuosl.org
 S:     Maintained
 F:     drivers/staging/
@@ -6212,6 +6212,11 @@ M:       David Rowe <david@rowetel.com>
 S:     Odd Fixes
 F:     drivers/staging/echo/
 
+STAGING - ET131X NETWORK DRIVER
+M:     Mark Einon <mark.einon@gmail.com>
+S:     Odd Fixes
+F:     drivers/staging/et131x/
+
 STAGING - FLARION FT1000 DRIVERS
 M:     Marek Belisko <marek.belisko@gmail.com>
 S:     Odd Fixes
@@ -6240,6 +6245,13 @@ W:       http://www.lirc.org/
 S:     Odd Fixes
 F:     drivers/staging/lirc/
 
+STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
+M:     Julian Andres Klode <jak@jak-linux.org>
+M:     Marc Dietrich <marvin24@gmx.de>
+L:     ac100@lists.launchpad.net (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/staging/nvec/
+
 STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 M:     Andres Salomon <dilinger@queued.net>
 M:     Chris Ball <cjb@laptop.org>
@@ -6338,7 +6350,7 @@ SUSPEND TO RAM
 M:     Len Brown <len.brown@intel.com>
 M:     Pavel Machek <pavel@ucw.cz>
 M:     "Rafael J. Wysocki" <rjw@sisk.pl>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/power/
 F:     arch/x86/kernel/acpi/