diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-04 13:52:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-04 13:52:35 -0700 |
| commit | 53c43c5ca13328ac8f415aa2251791b441a12b51 (patch) | |
| tree | ce6dbd7c97b5cf8755d94e03fcf2a63c719bfe1e /MAINTAINERS | |
| parent | staging/rdma/hfi1: select CRC32 (diff) | |
| download | linux-dev-53c43c5ca13328ac8f415aa2251791b441a12b51.tar.xz linux-dev-53c43c5ca13328ac8f415aa2251791b441a12b51.zip | |
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-- | MAINTAINERS | 8 |
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 S: Maintained F: drivers/staging/nvec/ +STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON) +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: Maintained +F: drivers/staging/olpc_dcon/ + STAGING - REALTEK RTL8712U DRIVERS M: Larry Finger <Larry.Finger@lwfinger.net> M: Florian Schilhabel <florian.c.schilhabel@googlemail.com>. |