diff options
| -rw-r--r-- | .mailmap | 3 | ||||
| -rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -56,7 +56,8 @@ Alexander Graf <agraf@csgraf.de> <agraf@suse.de> Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com> Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com> Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com> -Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com> +Frederic Konrad <konrad.frederic@yahoo.fr> <fred.konrad@greensocs.com> +Frederic Konrad <konrad.frederic@yahoo.fr> <konrad@adacore.com> Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com> Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com> Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn> diff --git a/MAINTAINERS b/MAINTAINERS index cc364afef7..68142340bd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1533,7 +1533,7 @@ F: include/hw/rtc/sun4v-rtc.h Leon3 M: Fabien Chouteau <chouteau@adacore.com> -M: KONRAD Frederic <frederic.konrad@adacore.com> +M: Frederic Konrad <konrad.frederic@yahoo.fr> S: Maintained F: hw/sparc/leon3.c F: hw/*/grlib* |