summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap8
1 files changed, 5 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index f8ffc64d0..fd289e87a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,7 +1,6 @@
# Map git author names and email addresses to canonical/preferred form.
+<Vineet.Gupta1@synopsys.com> <vgupta@synopsys.com>
<ak@linux.intel.com> <ak@suse.de>
-Chen Jingpiao <chenjingpiao@gmail.com>
-Chen Jingpiao <chenjingpiao@gmail.com> <chenjingpiao@foxmail.com>
<damir@altlinux.org> <damir@altlinux.ru>
<dgilbert@redhat.com> <dave@treblig.org>
<edgar.iglesias@gmail.com> <edgar@axis.com>
@@ -11,6 +10,7 @@ Chen Jingpiao <chenjingpiao@gmail.com> <chenjingpiao@foxmail.com>
<mark.hills@framestore.com> <Mark.Hills@framestore.com>
<nahim+dev@naam.me> <naam@lse.epita.fr>
<patrik.r.jakobsson@gmail.com> <patrik.jakobsson@linux.intel.com>
+<paul.chaignon@gmail.com> <paul@cilium.io>
<quentin.monnet@netronome.com> <quentin.monnet@6wind.com>
<schwab@linux-m68k.org> <aschwab@redhat.com>
<schwab@linux-m68k.org> <schwab@redhat.com>
@@ -19,9 +19,10 @@ Chen Jingpiao <chenjingpiao@gmail.com> <chenjingpiao@foxmail.com>
<thomas.de.schampheleire@gmail.com> <thomas.de_schampheleire@nokia.com>
<vda.linux@googlemail.com> <dvlasenk@redhat.com>
<vincent@gentoo.org> <vincent.riera@imgtec.com>
-<Vineet.Gupta1@synopsys.com> <vgupta@synopsys.com>
<will@williammanley.net> <william.manley@youview.com>
Carmelo Amoroso <carmelo.amoroso@st.com>
+Chen Jingpiao <chenjingpiao@gmail.com>
+Chen Jingpiao <chenjingpiao@gmail.com> <chenjingpiao@foxmail.com>
Edgar Kaziakhmedov <edgar.kaziakhmedov@virtuozzo.com> <edos@linux.com>
Elvira Khabirova <lineprinter@altlinux.org> <lineprinter0@gmail.com>
Eugene Syromyatnikov <evgsyr@gmail.com>
@@ -29,3 +30,4 @@ Eugene Syromyatnikov <evgsyr@gmail.com> <esyr@redhat.com>
Frederik Schüler <fs@debian.org>
Ma Jun <majun258@linux.alibaba.com>
Md Haris Iqbal <haris.phnx@gmail.com>
+Ákos Uzonyi <uzonyi.akos@gmail.com>