From: Aleksandar Markovic <address@hidden>
For some longish time I've been using multiple email addresses
for mailing list communication, and would like to consolidate it
into a single email address that is the most convenient to me.
My other emails, from rt-rk.com and wavecomp.com domains remain
active and I will respond from them too, if needed, but I would
like to manage almost all communication using gmail.com account.
Signed-off-by: Aleksandar Markovic <address@hidden>
---
.mailmap | 5 +++--
MAINTAINERS | 12 ++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/.mailmap b/.mailmap
index 76154c7..e431d1f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -39,8 +39,9 @@ Julia Suvorova <address@hidden> Julia Suvorova via Qemu-devel
<qemu-devel@nongnu
Justin Terry (VM) <address@hidden> Justin Terry (VM) via Qemu-devel
<address@hidden>
# Next, replace old addresses by a more recent one.
-Aleksandar Markovic <address@hidden> <address@hidden>
-Aleksandar Markovic <address@hidden> <address@hidden>
+Aleksandar Markovic <address@hidden> <address@hidden>
+Aleksandar Markovic <address@hidden> <address@hidden>
+Aleksandar Markovic <address@hidden> <address@hidden>
Aleksandar Rikalo <address@hidden> <address@hidden>
Anthony Liguori <address@hidden> Anthony Liguori <address@hidden>
James Hogan <address@hidden> <address@hidden>
diff --git a/MAINTAINERS b/MAINTAINERS
index 4fba8b8..8411c96 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -209,7 +209,7 @@ F: hw/microblaze/
F: disas/microblaze.c
MIPS TCG CPUs
-M: Aleksandar Markovic <address@hidden>
+M: Aleksandar Markovic <address@hidden>
R: Aurelien Jarno <address@hidden>
R: Aleksandar Rikalo <address@hidden>
S: Maintained
@@ -1016,7 +1016,7 @@ F: hw/display/jazz_led.c
F: hw/dma/rc4030.c
Malta
-M: Aleksandar Markovic <address@hidden>
+M: Aleksandar Markovic <address@hidden>
M: Philippe Mathieu-Daudé <address@hidden>
R: Aurelien Jarno <address@hidden>
S: Maintained
@@ -1029,14 +1029,14 @@ F: tests/acceptance/linux_ssh_mips_malta.py
F: tests/acceptance/machine_mips_malta.py
Mipssim
-M: Aleksandar Markovic <address@hidden>
+M: Aleksandar Markovic <address@hidden>
R: Aleksandar Rikalo <address@hidden>
S: Odd Fixes
F: hw/mips/mips_mipssim.c
F: hw/net/mipsnet.c
R4000
-M: Aleksandar Markovic <address@hidden>
+M: Aleksandar Markovic <address@hidden>
R: Aurelien Jarno <address@hidden>
R: Aleksandar Rikalo <address@hidden>
S: Obsolete
@@ -1044,7 +1044,7 @@ F: hw/mips/mips_r4k.c
Fulong 2E
M: Philippe Mathieu-Daudé <address@hidden>
-M: Aleksandar Markovic <address@hidden>
+M: Aleksandar Markovic <address@hidden>
S: Odd Fixes
F: hw/mips/mips_fulong2e.c
F: hw/isa/vt82c686.c
@@ -2508,7 +2508,7 @@ F: tcg/i386/
F: disas/i386.c
MIPS TCG target
-M: Aleksandar Markovic <address@hidden>
+M: Aleksandar Markovic <address@hidden>
R: Aurelien Jarno <address@hidden>
R: Aleksandar Rikalo <address@hidden>
S: Maintained