X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=.mailmap;h=3e2bff9137e918255231b3729a81c63251d5c62a;hb=19c8d912837e45e99b2991228adfc4419ffff248;hp=b44be834bcb6bfd43dab38fdd0509b7fd1277c7b;hpb=0c855563182001c829065faa17f8e29e9ceffe13;p=linux-2.6-microblaze.git

diff --git a/.mailmap b/.mailmap
index b44be834bcb6..3e2bff9137e9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,8 +25,9 @@ Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electr
 Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
 Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
 Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
-Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
-Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
+Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
+Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
+Alex Shi <alexs@kernel.org> <alex.shi@linux.alibaba.com>
 Al Viro <viro@ftp.linux.org.uk>
 Al Viro <viro@zenIV.linux.org.uk>
 Andi Kleen <ak@linux.intel.com> <ak@suse.de>