summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 82631b2846..d04f28bedf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,7 +8,7 @@
# scripts/mailmapper > tmp; mv tmp .mailmap
#
-Alexander Shiyan <shc@milas.spb.ru>
+Alexander Shiyan <shc_work@mail.ru>
Eric BĂ©nard <eric@eukrea.com>
Franck Jullien <franck.jullien@gmail.com>
Jin Zhengxiong <Jason.Jin@freescale.com>