From 33f8693365208684be62b307643cd56047c752de Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 24 Aug 2015 22:51:20 +0200 Subject: [PATCH] mailmap: Zhi Zhang affiliation Reviewed-by: Zhi Zhang Signed-off-by: Loic Dachary --- .mailmap | 1 + .organizationmap | 1 + .peoplemap | 1 + 3 files changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 20244e04639..03f43e632d8 100644 --- a/.mailmap +++ b/.mailmap @@ -266,6 +266,7 @@ Yuan Zhou Zengran Zhang Zhi (David) Zhang Zhi (David) Zhang Zhi Z Zhang +Zhi Zhang Zhiqiang Wang Signed-off-by: Zhiqiang Wang Zhiqiang Wang Wang, Zhiqiang Zhiqiang Wang Zhiqiang Wang diff --git a/.organizationmap b/.organizationmap index 5a5de231b08..4123940b6fb 100644 --- a/.organizationmap +++ b/.organizationmap @@ -297,6 +297,7 @@ Telecom Bretagne Ahoussi Armand Baptiste Veuillez Telecom Bretagne Hazem Amara Telecom Bretagne Thomas Cantin +Tencent Zhi Zhang The Linux Box Adam C. Emerson The Linux Box Ali Maredia The Linux Box Casey Bodley diff --git a/.peoplemap b/.peoplemap index c29508a322d..ac7934a91cf 100644 --- a/.peoplemap +++ b/.peoplemap @@ -44,3 +44,4 @@ Warren Usui Warren Usui Yan, Zheng Yan, Zheng Yehuda Sadeh Yehuda Sadeh Yuri Weinstein Yuri Weinstein +Zhi Zhang Zhi (David) Zhang