diff --git a/.mailmap b/.mailmap
index ee31062a..fa7c47ad 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>