From: Aleksandar Markovic <[email protected]>

Aleksandar Rikalo wishes to change his primary mail address for QEMU.
Some minor line order is corrected in .mailmap to be alphabetical,
too.

Reviewed-by: Aleksandar Rikalo <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Philippe Mathieu-Daudé <[email protected]>
Signed-off-by: Aleksandar Markovic <[email protected]>
---
 .mailmap    |  5 +++--
 MAINTAINERS | 18 +++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0756a0b..3816e4e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -39,10 +39,11 @@ Julia Suvorova <[email protected]> Julia Suvorova via 
Qemu-devel <qemu-devel@nongnu
 Justin Terry (VM) <[email protected]> Justin Terry (VM) via Qemu-devel 
<[email protected]>
 
 # Next, replace old addresses by a more recent one.
-Anthony Liguori <[email protected]> Anthony Liguori <[email protected]>
-James Hogan <[email protected]> <[email protected]>
 Aleksandar Markovic <[email protected]> <[email protected]>
 Aleksandar Markovic <[email protected]> <[email protected]>
+Aleksandar Rikalo <[email protected]> <[email protected]>
+Anthony Liguori <[email protected]> Anthony Liguori <[email protected]>
+James Hogan <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 3ca8148..4964fbb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -208,7 +208,7 @@ F: disas/microblaze.c
 MIPS TCG CPUs
 M: Aurelien Jarno <[email protected]>
 M: Aleksandar Markovic <[email protected]>
-R: Aleksandar Rikalo <[email protected]>
+R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: target/mips/
 F: default-configs/*mips*
@@ -363,7 +363,7 @@ F: target/arm/kvm.c
 
 MIPS KVM CPUs
 M: James Hogan <[email protected]>
-R: Aleksandar Rikalo <[email protected]>
+R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: target/mips/kvm.c
 
@@ -934,7 +934,7 @@ MIPS Machines
 -------------
 Jazz
 M: Hervé Poussineau <[email protected]>
-R: Aleksandar Rikalo <[email protected]>
+R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: hw/mips/mips_jazz.c
 F: hw/display/jazz_led.c
@@ -942,7 +942,7 @@ F: hw/dma/rc4030.c
 
 Malta
 M: Aurelien Jarno <[email protected]>
-R: Aleksandar Rikalo <[email protected]>
+R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: hw/mips/mips_malta.c
 F: hw/mips/gt64xxx_pci.c
@@ -950,20 +950,20 @@ F: tests/acceptance/linux_ssh_mips_malta.py
 
 Mipssim
 M: Aleksandar Markovic <[email protected]>
-R: Aleksandar Rikalo <[email protected]>
+R: Aleksandar Rikalo <[email protected]>
 S: Odd Fixes
 F: hw/mips/mips_mipssim.c
 F: hw/net/mipsnet.c
 
 R4000
 M: Aurelien Jarno <[email protected]>
-R: Aleksandar Rikalo <[email protected]>
+R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: hw/mips/mips_r4k.c
 
 Fulong 2E
 M: Aleksandar Markovic <[email protected]>
-R: Aleksandar Rikalo <[email protected]>
+R: Aleksandar Rikalo <[email protected]>
 S: Odd Fixes
 F: hw/mips/mips_fulong2e.c
 F: hw/isa/vt82c686.c
@@ -972,7 +972,7 @@ F: include/hw/isa/vt82c686.h
 
 Boston
 M: Paul Burton <[email protected]>
-R: Aleksandar Rikalo <[email protected]>
+R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: hw/core/loader-fit.c
 F: hw/mips/boston.c
@@ -2348,7 +2348,7 @@ F: disas/i386.c
 
 MIPS TCG target
 M: Aurelien Jarno <[email protected]>
-R: Aleksandar Rikalo <[email protected]>
+R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: tcg/mips/
 
-- 
2.7.4


Reply via email to