Aleksandar Rikalo want to use a different email address from now on. Signed-off-by: Aleksandar Markovic <aleksandar.qemu.de...@gmail.com> --- .mailmap | 3 ++- MAINTAINERS | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.mailmap b/.mailmap index 6412067bde..e3628c7a66 100644 --- a/.mailmap +++ b/.mailmap @@ -42,7 +42,8 @@ Justin Terry (VM) <jute...@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu Aleksandar Markovic <aleksandar.qemu.de...@gmail.com> <aleksandar.marko...@mips.com> Aleksandar Markovic <aleksandar.qemu.de...@gmail.com> <aleksandar.marko...@imgtec.com> Aleksandar Markovic <aleksandar.qemu.de...@gmail.com> <amarko...@wavecomp.com> -Aleksandar Rikalo <aleksandar.rik...@rt-rk.com> <arik...@wavecomp.com> +Aleksandar Rikalo <aleksandar.rik...@syrmia.com> <arik...@wavecomp.com> +Aleksandar Rikalo <aleksandar.rik...@syrmia.com> <aleksandar.rik...@rt-rk.com> Anthony Liguori <anth...@codemonkey.ws> Anthony Liguori <aligu...@us.ibm.com> James Hogan <jho...@kernel.org> <james.ho...@imgtec.com> Leif Lindholm <l...@nuviainc.com> <leif.lindh...@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 1f84e3ae2c..8d5562c5c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -212,7 +212,7 @@ F: disas/microblaze.c MIPS TCG CPUs M: Aleksandar Markovic <aleksandar.qemu.de...@gmail.com> R: Aurelien Jarno <aurel...@aurel32.net> -R: Aleksandar Rikalo <aleksandar.rik...@rt-rk.com> +R: Aleksandar Rikalo <aleksandar.rik...@syrmia.com> S: Maintained F: target/mips/ F: default-configs/*mips* @@ -1041,7 +1041,7 @@ MIPS Machines ------------- Jazz M: Hervé Poussineau <hpous...@reactos.org> -R: Aleksandar Rikalo <aleksandar.rik...@rt-rk.com> +R: Aleksandar Rikalo <aleksandar.rik...@syrmia.com> S: Maintained F: hw/mips/mips_jazz.c F: hw/display/jazz_led.c @@ -1062,7 +1062,7 @@ F: tests/acceptance/machine_mips_malta.py Mipssim M: Aleksandar Markovic <aleksandar.qemu.de...@gmail.com> -R: Aleksandar Rikalo <aleksandar.rik...@rt-rk.com> +R: Aleksandar Rikalo <aleksandar.rik...@syrmia.com> S: Odd Fixes F: hw/mips/mips_mipssim.c F: hw/net/mipsnet.c @@ -1070,7 +1070,7 @@ F: hw/net/mipsnet.c R4000 M: Aleksandar Markovic <aleksandar.qemu.de...@gmail.com> R: Aurelien Jarno <aurel...@aurel32.net> -R: Aleksandar Rikalo <aleksandar.rik...@rt-rk.com> +R: Aleksandar Rikalo <aleksandar.rik...@syrmia.com> S: Obsolete F: hw/mips/mips_r4k.c @@ -1085,7 +1085,7 @@ F: include/hw/isa/vt82c686.h Boston M: Paul Burton <pbur...@wavecomp.com> -R: Aleksandar Rikalo <aleksandar.rik...@rt-rk.com> +R: Aleksandar Rikalo <aleksandar.rik...@syrmia.com> S: Maintained F: hw/core/loader-fit.c F: hw/mips/boston.c @@ -2582,7 +2582,7 @@ F: disas/i386.c MIPS TCG target M: Aleksandar Markovic <aleksandar.qemu.de...@gmail.com> R: Aurelien Jarno <aurel...@aurel32.net> -R: Aleksandar Rikalo <aleksandar.rik...@rt-rk.com> +R: Aleksandar Rikalo <aleksandar.rik...@syrmia.com> S: Maintained F: tcg/mips/ -- 2.20.1
