From 2c7006f8b4f67bce3cfd7fd7b6fd88ef359ddf4a Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 9 Mar 2015 11:46:20 +0100
Subject: [PATCH] mailmap: Zhi (David) Zhang affiliation

And name normalization

Reviewed-by: Zhi (David) Zhang <zhangz@yahoo-inc.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
---
 .mailmap         | 1 +
 .organizationmap | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index d3eaa221533..d95ca13c360 100644
--- a/.mailmap
+++ b/.mailmap
@@ -45,6 +45,7 @@ Dan Mick <dmick@redhat.com> <dmick@danceorelse.org>
 Dan Mick <dmick@redhat.com> <dan.mick@redhat.com>
 Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
 David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
+Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
 Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
 Dominik Hannen <cantares1+github@gmail.com> Dominik Hannen <dhxgit@users.noreply.github.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index a0c2c5575db..25177ef1f62 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -316,7 +316,7 @@ Whatever <contact@whatever-company.com> Sylvain Munaut <s.munaut@whatever-compan
 Wido 42on <contact@42on.com> Wido den Hollander <wido@42on.com>
 X-ION <contact@x-ion.de> Mouad Benchchaoui <m.benchchaoui@x-ion.de>
 X-ION <contact@x-ion.de> Stephan Renatus <s.renatus@x-ion.de>
-Yahoo! <contact@yahoo-inc.com> David Zhang <david.z1003@yahoo.com>
+Yahoo! <contact@yahoo-inc.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Guang Yang <yguang@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Haifeng Liu <haifeng@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Lei Dong <leidong@yahoo-inc.com>
-- 
2.47.3