Update email addresses in MAINTAINERS and .mailmap

90effdcd · Shuah Khan <[email protected]> · 2016-06-14 16:30:27 -06:00

Updating email addresses in MAINTAINERS and .mailmap files.

Cc: [email protected]
Signed-off-by: Shuah Khan <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 90effdcd2b8a39927aace655c72088a62911e8e1
Parents: 5dc8a864

Changes

2 files changed · +4 −1

File	Status	Add	Del	Content
.mailmap	modified	+1	−0	View file
MAINTAINERS	modified	+3	−1	View file

.mailmap

View file

diff --git a/.mailmap b/.mailmap
index 4a293be..779a9ca 100644
--- a/.mailmap
+++ b/.mailmap
@@ -123,6 +123,7 @@ Santosh Shilimkar <[email protected]>
 Sascha Hauer <[email protected]>
 S.Çağlar Onur <[email protected]>
 Shiraz Hashim <[email protected]> <[email protected]>
+Shuah Khan <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]>
 Simon Kelley <[email protected]>
 Stéphane Witzmann <[email protected]>
 Stephen Hemminger <[email protected]>

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 29e22bf..7c326f1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6497,6 +6497,7 @@ F:	include/uapi/linux/sunrpc/
 
 KERNEL SELFTEST FRAMEWORK
 M:	Shuah Khan <[email protected]>
+M:	Shuah Khan <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/shuah/linux-kselftest
 S:	Maintained
@@ -11902,7 +11903,8 @@ F:	drivers/usb/common/usb-otg-fsm.c
 
 USB OVER IP DRIVER
 M:	Valentina Manea <[email protected]>
-M:	Shuah Khan <[email protected]>
+M:	Shuah Khan <[email protected]>
+M:	Shuah Khan <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/usb/usbip_protocol.txt