summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/staging/panel/TODO2
2 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 30aca4a..48d09cc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10401,7 +10401,7 @@ S: Maintained
F: drivers/staging/olpc_dcon/
STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
-M: Willy Tarreau <willy@meta-x.org>
+M: Willy Tarreau <willy@haproxy.com>
S: Odd Fixes
F: drivers/staging/panel/
diff --git a/drivers/staging/panel/TODO b/drivers/staging/panel/TODO
index 2db3f99..3a6405a 100644
--- a/drivers/staging/panel/TODO
+++ b/drivers/staging/panel/TODO
@@ -5,4 +5,4 @@ TODO:
- see if all of this could be easier done in userspace instead.
Please send patches to Greg Kroah-Hartman <greg@kroah.com> and
-Willy Tarreau <willy@meta-x.org>
+Willy Tarreau <willy@haproxy.com>
OpenPOWER on IntegriCloud