mailmap: Feng Yu affiliation and name normalization

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

diff --git a/.mailmap b/.mailmap
index b30c2708ed65427ef697e3b5baa87d6a3feb2ba2..d02ac51a16c2b14dd8ac396c799be0e381f48d8f 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -88,6 +88,7 @@ Esteban Molina-Estolano <eestolan@lanl.gov> <eestolan@29311d96-e01e-0410-9327-a3
 Fangchen Sun <sunspot0105@gmail.com>
 Federico Gimenez <fgimenez@coit.es> <federico.gimenez@hola-internet.com>
 Feng Wang <cyclonew@cs.ucsc.edu> <cyclonew@29311d96-e01e-0410-9327-a35deaab8ce9>
+Feng Yu <amoxic@126.com>
 Florent Bautista <florent@coppint.com>
 Florent Flament <florent.flament@cloudwatt.com> <florent.flament-ext@cloudwatt.com>
 Florent Manens <florent@beezim.fr> <florent@manens.org>

diff --git a/.organizationmap b/.organizationmap
index 2f269c650138f64d681aa42cc6ca12a6f621d3df..3e767f58bf0100df47b3756646b24aa3c8f7f52f 100644 (file)
--- a/.organizationmap
+++ b/.organizationmap
@@ -475,6 +475,7 @@ Unaffiliated <no@organization.net> fangdong <yp.fangdong@gmail.com>
 Unaffiliated <no@organization.net> Federico Gimenez <fgimenez@coit.es>
 Unaffiliated <no@organization.net> Feng Guo <diluga@gmail.com>
 Unaffiliated <no@organization.net> Feng He <fenglife@hotmail.com>
+Unaffiliated <no@organization.net> Feng Yu <amoxic@126.com> 
 Unaffiliated <no@organization.net> Florent Bautista <florent@coppint.com>
 Unaffiliated <no@organization.net> Florian Coste <fcoste21@gmail.com>
 Unaffiliated <no@organization.net> Florian Marsylle <florian.marsylle@hotmail.fr>