summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandar Markovic <aleksandar.markovic@mips.com>2017-10-20 16:27:44 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2018-02-05 08:58:33 -0800
commit848a96c7c180a528ac79b0ab73886842f707ec8e (patch)
tree3f98d176328179ac31a0835a51d4fc0e88632bea
parent1faba225e9bf454caaae3f3b469941361afc0a50 (diff)
UPSTREAM: MIPS: Update RINT emulation maintainer email address
Change all relevant instances of aleksandar.markovic@imgtec.com email address to aleksandar.markovic@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/17514/ Signed-off-by: James Hogan <jhogan@kernel.org> (cherry picked from commit 89677e44b26ef49fd57208c7885fdd729b3724e5) 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 b1e9a97653dc..8c5993eefdcc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,6 +14,7 @@ Adrian Bunk <bunk@stusta.de>
Alan Cox <alan@lxorguk.ukuu.org.uk>
Alan Cox <root@hraefn.swansea.linux.org.uk>
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
+Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
Al Viro <viro@ftp.linux.org.uk>
Al Viro <viro@zenIV.linux.org.uk>
Andreas Herrmann <aherrman@de.ibm.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index a9925754dd49..d24aa29fdb13 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7061,7 +7061,7 @@ F: Documentation/mips/
F: arch/mips/
MIPS RINT INSTRUCTION EMULATION
-M: Aleksandar Markovic <aleksandar.markovic@imgtec.com>
+M: Aleksandar Markovic <aleksandar.markovic@mips.com>
L: linux-mips@linux-mips.org
S: Supported
F: arch/mips/math-emu/sp_rint.c