[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1465943427-11528-1-git-send-email-shuahkh@osg.samsung.com>
Date: Tue, 14 Jun 2016 16:30:27 -0600
From: Shuah Khan <shuahkh@....samsung.com>
To: akpm@...ux-foundation.org, torvalds@...ux-foundation.org
Cc: Shuah Khan <shuahkh@....samsung.com>, linux-kernel@...r.kernel.org,
linux-kselftest@...r.kernel.org, stable@...r.kernel.org
Subject: [PATCH] Update email addresses in MAINTAINERS and .mailmap
Updating email addresses in MAINTAINERS and .mailmap files.
Cc: stable@...r.kernel.org
Signed-off-by: Shuah Khan <shuahkh@....samsung.com>
---
.mailmap | 1 +
MAINTAINERS | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index 08b8042..feb0fd5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -122,6 +122,7 @@ Santosh Shilimkar <santosh.shilimkar@...cle.org>
Sascha Hauer <s.hauer@...gutronix.de>
S.Çağlar Onur <caglar@...dus.org.tr>
Shiraz Hashim <shiraz.linux.kernel@...il.com> <shiraz.hashim@...com>
+Shuah Khan <shuah@...nel.org> <shuahkhan@...il.com> <shuah.khan@...com> <shuahkh@....samsung.com> <shuah.kh@...sung.com>
Simon Kelley <simon@...kelleys.org.uk>
Stéphane Witzmann <stephane.witzmann@...mes.univ-bpclermont.fr>
Stephen Hemminger <shemminger@...l.org>
diff --git a/MAINTAINERS b/MAINTAINERS
index ed42cb6..5e94e6e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6486,6 +6486,7 @@ F: include/uapi/linux/sunrpc/
KERNEL SELFTEST FRAMEWORK
M: Shuah Khan <shuahkh@....samsung.com>
+M: Shuah Khan <shuah@...nel.org>
L: linux-kselftest@...r.kernel.org
T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest
S: Maintained
@@ -11887,7 +11888,8 @@ F: drivers/usb/common/usb-otg-fsm.c
USB OVER IP DRIVER
M: Valentina Manea <valentina.manea.m@...il.com>
-M: Shuah Khan <shuah.kh@...sung.com>
+M: Shuah Khan <shuahkh@....samsung.com>
+M: Shuah Khan <shuah@...nel.org>
L: linux-usb@...r.kernel.org
S: Maintained
F: Documentation/usb/usbip_protocol.txt
--
2.7.4
Powered by blists - more mailing lists