From: Loic Dachary <loic@dachary.org>
Date: Tue, 8 Apr 2014 16:09:45 +0000 (+0200)
Subject: mailmap: Yan, Zheng name normalization
X-Git-Tag: v0.80-rc1~48^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1622%2Fhead;p=ceph.git

mailmap: Yan, Zheng name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/.mailmap b/.mailmap
index 92048cc62c4..d2ab06d0738 100644
--- a/.mailmap
+++ b/.mailmap
@@ -106,6 +106,7 @@ Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gm
 Loic Dachary <loic@dachary.org> <loic@dachary.com>
 Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
 Yan, Zheng <zheng.z.yan@intel.com> Zheng, Yan <zheng.z.yan@intel.com>
+Yan, Zheng <zheng.z.yan@intel.com> Zheng Yan <zheng.z.yan@intel.com>
 Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
 Wang, Yaguang <yaguang.wang@intel.com> ywang19 <yaguang.wang@intel.com>
 David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>