summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2017-11-13 20:21:22 +0000
committerDmitry V. Levin <ldv@altlinux.org>2017-11-13 20:21:22 +0000
commit6bca8555fc2147171710062b96fe1345e72d22dc (patch)
tree65859493871e14f6c3d1ca4d9c1efbd07e843ffc /.mailmap
parent469c4053c5850b175af275c24fef99b9fd2a876c (diff)
downloadstrace-6bca8555fc2147171710062b96fe1345e72d22dc.tar.gz
.mailmap: sort entries
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap20
1 files changed, 10 insertions, 10 deletions
diff --git a/.mailmap b/.mailmap
index ee31062a1..fa7c47ade 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,23 +1,23 @@
# Map git author names and email addresses to canonical/preferred form.
<ak@linux.intel.com> <ak@suse.de>
<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>
<holger@freyther.de> <zecke@selfish.org>
<kirill@shutemov.name> <kirill.shutemov@linux.intel.com>
-<schwab@linux-m68k.org> <schwab@redhat.com>
-<schwab@linux-m68k.org> <schwab@suse.de>
-<thomas.de.schampheleire@gmail.com> <thomas.de_schampheleire@nokia.com>
-<vda.linux@googlemail.com> <dvlasenk@redhat.com>
-Edgar Kaziakhmedov <edgar.kaziakhmedov@virtuozzo.com> <edos@linux.com>
-Eugene Syromyatnikov <evgsyr@gmail.com>
-Eugene Syromyatnikov <evgsyr@gmail.com> <esyr@redhat.com>
-Carmelo Amoroso <carmelo.amoroso@st.com>
-<damir@altlinux.org> <damir@altlinux.ru>
-<edgar.iglesias@gmail.com> <edgar@axis.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>
+<schwab@linux-m68k.org> <schwab@redhat.com>
+<schwab@linux-m68k.org> <schwab@suse.de>
<steve@einval.com> <steve.mcintyre@linaro.org>
+<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>
+Edgar Kaziakhmedov <edgar.kaziakhmedov@virtuozzo.com> <edos@linux.com>
+Eugene Syromyatnikov <evgsyr@gmail.com>
+Eugene Syromyatnikov <evgsyr@gmail.com> <esyr@redhat.com>