summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandar Markovic <aleksandar.markovic@mips.com>2017-10-20 16:27:45 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2018-02-05 08:58:33 -0800
commit960cfd07111c3ec84829bb2665d9baf506e126bf (patch)
tree684cb7d67d3853e29fa5019c6abe7b5fe473f663
parent848a96c7c180a528ac79b0ab73886842f707ec8e (diff)
UPSTREAM: MIPS: Update Goldfish RTC driver maintainer email address
Change all relevant instances of miodrag.dinic@imgtec.com email address to miodrag.dinic@mips.com. Signed-off-by: Miodrag Dinic <miodrag.dinic@mips.com> Signed-off-by: Aleksandar Markovic <aleksandar.markovic@mips.com> Patchwork: https://patchwork.linux-mips.org/patch/17515/ [jhogan@kernel.org: Fix .mailmap direction] Signed-off-by: James Hogan <jhogan@kernel.org> (cherry picked from commit 0464a53eba0af434b8516c2e01d881aa587cd517) Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 8c5993eefdcc..8cbe2bd7d090 100644
--- a/.mailmap
+++ b/.mailmap
@@ -86,6 +86,7 @@ Matthieu CASTET <castet.matthieu@free.fr>
Mayuresh Janorkar <mayur@ti.com>
Michael Buesch <m@bues.ch>
Michel Dänzer <michel@tungstengraphics.com>
+Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
Mitesh shah <mshah@teja.com>
Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
Morten Welinder <terra@gnome.org>
diff --git a/MAINTAINERS b/MAINTAINERS
index d24aa29fdb13..48bf18de18bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -757,7 +757,7 @@ F: drivers/android/
F: drivers/staging/android/
ANDROID GOLDFISH RTC DRIVER
-M: Miodrag Dinic <miodrag.dinic@imgtec.com>
+M: Miodrag Dinic <miodrag.dinic@mips.com>
S: Supported
F: Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
F: drivers/rtc/rtc-goldfish.c