aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 97f7b4fb6139..4e83e7b52d15 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Christoph Hellwig <hch@lst.de>
32Corey Minyard <minyard@acm.org> 32Corey Minyard <minyard@acm.org>
33David Brownell <david-b@pacbell.net> 33David Brownell <david-b@pacbell.net>
34David Woodhouse <dwmw2@shinybook.infradead.org> 34David Woodhouse <dwmw2@shinybook.infradead.org>
35Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
35Domen Puncer <domen@coderock.org> 36Domen Puncer <domen@coderock.org>
36Douglas Gilbert <dougg@torque.net> 37Douglas Gilbert <dougg@torque.net>
37Ed L. Cashin <ecashin@coraid.com> 38Ed L. Cashin <ecashin@coraid.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 141aff67bd6d..ee65a28a9cc9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -616,7 +616,7 @@ M: mkpetch@internode.on.net
616S: Maintained 616S: Maintained
617 617
618ARM/TOSA MACHINE SUPPORT 618ARM/TOSA MACHINE SUPPORT
619P: Dmitry Baryshkov 619P: Dmitry Eremin-Solenikov
620M: dbaryshkov@gmail.com 620M: dbaryshkov@gmail.com
621P: Dirk Opfer 621P: Dirk Opfer
622M: dirk@opfer-online.de 622M: dirk@opfer-online.de