Merge branch 'staging-next' into Linux 3.1

This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 13 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6185d0513584..6e3805cceab3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6134,7 +6134,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/
@@ -6181,6 +6181,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
@@ -6209,6 +6214,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>