Merge tag 'staging-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8197fbd..c378072 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6066,7 +6066,7 @@ M:        Rob Herring <rob.herring@calxeda.com>
 M:     Pawel Moll <pawel.moll@arm.com>
 M:     Mark Rutland <mark.rutland@arm.com>
 M:     Stephen Warren <swarren@wwwdotorg.org>
-M:     Ian Campbell <ian.campbell@citrix.com>
+M:     Ian Campbell <ijc+devicetree@hellion.org.uk>
 L:     devicetree@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/
@@ -7890,11 +7890,11 @@ S:      Maintained
 F:     drivers/staging/nvec/
 
 STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
-M:     Andres Salomon <dilinger@queued.net>
-M:     Chris Ball <cjb@laptop.org>
+M:     Jens Frederich <jfrederich@gmail.com>
+M:     Daniel Drake <dsd@laptop.org>
 M:     Jon Nettleton <jon.nettleton@gmail.com>
 W:     http://wiki.laptop.org/go/DCON
-S:     Odd Fixes
+S:     Maintained
 F:     drivers/staging/olpc_dcon/
 
 STAGING - OZMO DEVICES USB OVER WIFI DRIVER
@@ -8803,7 +8803,6 @@ W:        http://www.linux-usb.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
 S:     Supported
 F:     Documentation/usb/
-F:     drivers/net/usb/
 F:     drivers/usb/
 F:     include/linux/usb.h
 F:     include/linux/usb/