From: Yann Dupont <yann@objoo.org>
Date: Mon, 8 Feb 2016 21:29:08 +0000 (+0100)
Subject: mailmap: Shun Song affiliation
X-Git-Tag: v10.1.0~393^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8e0521c30eab04e5f6b82c18d0dbc07e96d8d44;p=ceph.git

mailmap: Shun Song affiliation

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

diff --git a/.mailmap b/.mailmap
index ade5c3c69afb..47c8d4f91173 100644
--- a/.mailmap
+++ b/.mailmap
@@ -246,6 +246,9 @@ Sergey Arkhipov <nineseconds@yandex.ru>
 Shanggao Qiu <qiushanggao@qq.com>
 Shawn Chen <cxwshawn@gmail.com>
 Shu, Xinxin <xinxin.shu@intel.com>
+Shun Song <song.shun3@zte.com.cn>
+Shun Song <song.shun3@zte.com.cn> <songshun134@126.com>
+Shun Song <song.shun3@zte.com.cn> <root@clove83.zte.com.cn>
 Song Baisen <song.baisen@zte.com.cn>
 Stephen F Taylor <steveftaylor@gmail.com> <steve@DES-U1404-STETAY.stc.local>
 Sushma Gurram <sushma.gurram@sandisk.com>
diff --git a/.organizationmap b/.organizationmap
index 8ea5e2156f79..bfc62c0533b1 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -525,6 +525,7 @@ ZTE <contact@zte.com.cn> Chuanhong Wang <wang.chuanhong@zte.com.cn>
 ZTE <contact@zte.com.cn> Luo Kexue <luo.kexue@zte.com.cn>
 ZTE <contact@zte.com.cn> Ren Huanwen <ren.huanwen@zte.com.cn>
 ZTE <contact@zte.com.cn> Xie Xingguo <xie.xingguo@zte.com.cn>
+ZTE <contact@zte.com.cn> Shun Song <song.shun3@zte.com.cn>
 ZTE <contact@zte.com.cn> Song Baisen <song.baisen@zte.com.cn>
 #
 # Local Variables: