From: Aleksandar Markovic <amarko...@wavecomp.com>

Update email addresses of Aleksandar Markovic and Paul Burton in the
MAINTAINERS file. Also, add corresponding items in the .mailmap file.

Signed-off-by: Aleksandar Markovic <amarko...@wavecomp.com>
---
 .mailmap    | 7 +++++--
 MAINTAINERS | 9 +++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.mailmap b/.mailmap
index 778a4d4..2c2b9b1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,8 +12,11 @@ Fabrice Bellard <fabr...@bellard.org> bellard 
<bellard@c046a42c-6fe2-441c-8c8c-7
 James Hogan <jho...@kernel.org> <james.ho...@imgtec.com>
 Jocelyn Mayer <l_ind...@magic.fr> j_mayer 
<j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
 Paul Brook <p...@codesourcery.com> pbrook 
<pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
-Paul Burton <paul.bur...@mips.com> <paul.bur...@imgtec.com>
-Paul Burton <paul.bur...@mips.com> <p...@archlinuxmips.org>
+Aleksandar Markovic <amarko...@wavecomp.com> <aleksandar.marko...@mips.com>
+Aleksandar Markovic <amarko...@wavecomp.com> <aleksandar.marko...@imgtec.com>
+Paul Burton <pbur...@wavecomp.com> <paul.bur...@mips.com>
+Paul Burton <pbur...@wavecomp.com> <paul.bur...@imgtec.com>
+Paul Burton <pbur...@wavecomp.com> <p...@archlinuxmips.org>
 Thiemo Seufer <t...@networkno.de> ths 
<ths@c046a42c-6fe2-441c-8c8c-71466251a162>
 malc <av1...@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 6630d69..f3863b1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -187,7 +187,7 @@ F: disas/microblaze.c
 
 MIPS
 M: Aurelien Jarno <aurel...@aurel32.net>
-M: Aleksandar Markovic <aleksandar.marko...@mips.com>
+M: Aleksandar Markovic <amarko...@wavecomp.com>
 S: Maintained
 F: target/mips/
 F: hw/mips/
@@ -718,7 +718,7 @@ S: Maintained
 F: hw/mips/mips_malta.c
 
 Mipssim
-M: Aleksandar Markovic <aleksandar.marko...@mips.com>
+M: Aleksandar Markovic <amarko...@wavecomp.com>
 S: Odd Fixes
 F: hw/mips/mips_mipssim.c
 F: hw/net/mipsnet.c
@@ -729,14 +729,15 @@ S: Maintained
 F: hw/mips/mips_r4k.c
 
 Fulong 2E
-M: Aleksandar Markovic <aleksandar.marko...@mips.com>
+M: Aleksandar Markovic <amarko...@wavecomp.com>
 S: Odd Fixes
 F: hw/mips/mips_fulong2e.c
 F: hw/isa/vt82c686.c
+
 F: include/hw/isa/vt82c686.h
 
 Boston
-M: Paul Burton <paul.bur...@mips.com>
+M: Paul Burton <pbur...@wavecomp.com>
 S: Maintained
 F: hw/core/loader-fit.c
 F: hw/mips/boston.c
-- 
2.7.4


Reply via email to