From: Loic Dachary <loic-201408@dachary.org>
Date: Sun, 19 Oct 2014 17:23:00 +0000 (-0700)
Subject: mailmap: Ma Jianpeng name normalization
X-Git-Tag: v0.88~27^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b42627b400b3fd203ea389df1c814bec1905515c;p=ceph.git

mailmap: Ma Jianpeng name normalization

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

diff --git a/.mailmap b/.mailmap
index bbd9b2395440..60ec1a367fa0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -96,6 +96,7 @@ Loic Dachary <loic@dachary.org> <loic@dachary.com>
 Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
 Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
 Ma Jianpeng <jianpeng.ma@intel.com> Ma, Jianpeng <jianpeng.ma@intel.com>
+Ma Jianpeng <jianpeng.ma@intel.com> Jianpeng Ma <jianpeng.ma@intel.com>
 Marco Garcês <marco.garces@bci.co.mz> Marco Garcês <marco@garces.cc>
 Mark Nelson <mark.nelson@inktank.com> <mark.a.nelson@gmail.com>
 Matthew Roy <matthew@royhousehold.net> <matthew@matthew-ubuntu.(none)>