From 17c8a230b8273c446db1ccce2bf7a77f93e7c0fd Mon Sep 17 00:00:00 2001
From: Loic Dachary <loic@dachary.org>
Date: Fri, 7 Feb 2014 17:33:39 +0100
Subject: [PATCH] mailmap: Yan, Zheng name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index ba6f655cd8c0..93e86bfdd7d5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -105,6 +105,7 @@ Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gm
 Loic Dachary <loic@dachary.org> <loic@dachary.com>
 Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
 Yan, Zheng <zheng.z.yan@intel.com> Zheng, Yan <zheng.z.yan@intel.com>
+Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
 David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
 Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
-- 
2.47.3