Update email addresses in MAINTAINERS and .mailmap

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]>
jchandra-cavm · Jun 16, 2016 · 90effdc · 90effdc
1 parent 5dc8a86
commit 90effdc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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]>

diff --git 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