From: Alex Shi <alex.shi@linux.alibaba.com>
Date: Wed, 13 Mar 2019 13:49:54 +0000 (+0800)
Subject: mailmap: update email address for Triplex
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0e4f08b85206c826475d291211ce4b4ba40541ed;p=openwrt%2Fstaging%2Fblogic.git

mailmap: update email address for Triplex

triplex@zh-kernel.org and zhongyu@18mail.cn is absolete email address
for TripleX Chung <xxx.phy@gmail.com>

Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: TripleX Chung <xxx.phy@gmail.com>
Signed-off-by: Weiwei Jia <harryxiyou@gmail.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---

diff --git a/.mailmap b/.mailmap
index 705c4f11f1a3..e5979518c396 100644
--- a/.mailmap
+++ b/.mailmap
@@ -207,6 +207,8 @@ Tejun Heo <htejun@gmail.com>
 Thomas Graf <tgraf@suug.ch>
 Thomas Pedersen <twp@codeaurora.org>
 Tony Luck <tony.luck@intel.com>
+TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
+TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
 Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
 Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Uwe Kleine-König <ukl@pengutronix.de>