diff options
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | drivers/staging/olpc_dcon/TODO | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7cacc88dc79c..65e29558e0a6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/staging/olpc_dcon/TODO b/drivers/staging/olpc_dcon/TODO index f378e848b51a..901b891d38b2 100644 --- a/drivers/staging/olpc_dcon/TODO +++ b/drivers/staging/olpc_dcon/TODO @@ -10,6 +10,5 @@ TODO: Please send patches to Greg Kroah-Hartman <greg@kroah.com> and copy: - Andres Salomon <dilinger@queued.net> - Chris Ball <cjb@laptop.org> - Jon Nettleton <jon.nettleton@gmail.com> + Daniel Drake <dsd@laptop.org> + Jens Frederich <jfrederich@gmail.com> |