From 845a326f95f14544e5b3c4b4c8549b3871c8c354 Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Wed, 13 Mar 2019 21:49:52 +0800 Subject: mailmap: update Li Yang's email address Update the obsolete email address leoli@freescale.com and leo@zh-kernel.org with leoyang.li@nxp.com. Signed-off-by: Alex Shi Cc: Andrew Morton Cc: Li Yang Signed-off-by: Weiwei Jia Signed-off-by: Jonathan Corbet --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 37e1847c7988..705c4f11f1a3 100644 --- a/.mailmap +++ b/.mailmap @@ -117,6 +117,8 @@ Leonid I Ananiev Linas Vepstas Linus Lüssing Linus Lüssing +Li Yang +Li Yang Maciej W. Rozycki Marcin Nowakowski Mark Brown -- cgit v1.2.3 From 0e4f08b85206c826475d291211ce4b4ba40541ed Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Wed, 13 Mar 2019 21:49:54 +0800 Subject: mailmap: update email address for Triplex triplex@zh-kernel.org and zhongyu@18mail.cn is absolete email address for TripleX Chung Signed-off-by: Alex Shi Cc: Andrew Morton Cc: TripleX Chung Signed-off-by: Weiwei Jia Signed-off-by: Jonathan Corbet --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 705c4f11f1a3..e5979518c396 100644 --- a/.mailmap +++ b/.mailmap @@ -207,6 +207,8 @@ Tejun Heo Thomas Graf Thomas Pedersen Tony Luck +TripleX Chung +TripleX Chung Tsuneo Yoshioka Uwe Kleine-König Uwe Kleine-König -- cgit v1.2.3 From 9b628c6ab437fd5217d50bb021128bc54f661f03 Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Wed, 13 Mar 2019 21:49:59 +0800 Subject: mailmap: update my obsolete email address I am not working for Intel or Linaro, so udpate the email address. Signed-off-by: Alex Shi Cc: Andrew Morton Cc: Li Yang Signed-off-by: Weiwei Jia Signed-off-by: Jonathan Corbet --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index e5979518c396..7dc884c03d13 100644 --- a/.mailmap +++ b/.mailmap @@ -16,6 +16,8 @@ Alan Cox Alan Cox Aleksey Gorelov Aleksandar Markovic +Alex Shi +Alex Shi Al Viro Al Viro Andi Shyti -- cgit v1.2.3