From: Loic Dachary <loic@dachary.org>
Date: Fri, 7 Feb 2014 16:33:39 +0000 (+0100)
Subject: mailmap: Yan, Zheng name normalization
X-Git-Tag: v0.78~204^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17c8a230b8273c446db1ccce2bf7a77f93e7c0fd;p=ceph.git

mailmap: Yan, Zheng name normalization

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

diff --git a/.mailmap b/.mailmap
index ba6f655cd8c0..93e86bfdd7d5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -105,6 +105,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> <ukernel@gmail.com>
 David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
 Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>