From: Yann Dupont <yann@objoo.org>
Date: Wed, 3 Feb 2016 22:38:04 +0000 (+0100)
Subject: mailmap: Xie Xingguo affiliation
X-Git-Tag: v10.1.0~393^2~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0fe937368bec7f8b75ba21efe9895b8e08bc9a98;p=ceph.git

mailmap: Xie Xingguo affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
---

diff --git a/.mailmap b/.mailmap
index fe18209aa06..99a696d70a5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -282,6 +282,7 @@ Xiaowei Chen <chen.xiaowei@h3c.com>
 Xiaowei Chen <chen.xiaowei@h3c.com> <cxwshawn@gmail.com>
 Xie Rui <875016668@qq.com>
 Xie Rui <875016668@qq.com> <jerry.xr86@gmail.com>
+Xie Xingguo <xie.xingguo@zte.com.cn>
 Xie Xingguo <xie.xingguo@zte.com.cn> <258156334@qq.com>
 Xie Xingguo <xie.xingguo@zte.com.cn> <xie.xiexingguo@zte.com.cn>
 Xingyi Wu <wuxingyi2015@outlook.com>
diff --git a/.organizationmap b/.organizationmap
index a797f2d1ee4..5960e524b76 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -518,7 +518,7 @@ Yahoo! <contact@yahoo-inc.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
 YouScribe <contact@youscribe.fr> Guilhem Lettron <guilhem@lettron.fr>
 ZTE <contact@zte.com.cn> Chuanhong Wang <wang.chuanhong@zte.com.cn>
 ZTE <contact@zte.com.cn> Ren Huanwen <ren.huanwen@zte.com.cn>
-ZTE <contact@zte.com.cn> <xie.xingguo@zte.com.cn>
+ZTE <contact@zte.com.cn> Xie Xingguo <xie.xingguo@zte.com.cn>
 ZTE <contact@zte.com.cn> Song Baisen <song.baisen@zte.com.cn>
 #
 # Local Variables: