summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-04 16:52:35 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-04 16:52:35 -0400
commit53c43c5ca13328ac8f415aa2251791b441a12b51 (patch)
treece6dbd7c97b5cf8755d94e03fcf2a63c719bfe1e /MAINTAINERS
parent6d79b6c761dd76b947505340adb07c8b90296a9e (diff)
Revert "Staging: olpc_dcon: Remove obsolete driver"
This reverts commit 82ef33af9dd30075adbd9f3dd161b606b8ba88ac. It turns out these machines are still out there, and the original patch broke them. So revert it, adding back the driver, so people's machines still work properly. Reported-by: James Cameron <quozl@laptop.org> Cc: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 03e00c7c88eb..6cd7a5c6adca 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10583,6 +10583,14 @@ L: linux-tegra@vger.kernel.org
10583S: Maintained 10583S: Maintained
10584F: drivers/staging/nvec/ 10584F: drivers/staging/nvec/
10585 10585
10586STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
10587M: Jens Frederich <jfrederich@gmail.com>
10588M: Daniel Drake <dsd@laptop.org>
10589M: Jon Nettleton <jon.nettleton@gmail.com>
10590W: http://wiki.laptop.org/go/DCON
10591S: Maintained
10592F: drivers/staging/olpc_dcon/
10593
10586STAGING - REALTEK RTL8712U DRIVERS 10594STAGING - REALTEK RTL8712U DRIVERS
10587M: Larry Finger <Larry.Finger@lwfinger.net> 10595M: Larry Finger <Larry.Finger@lwfinger.net>
10588M: Florian Schilhabel <florian.c.schilhabel@googlemail.com>. 10596M: Florian Schilhabel <florian.c.schilhabel@googlemail.com>.