summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorShuah Khan <shuahkh@osg.samsung.com>2016-06-15 01:30:27 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-16 04:35:37 +0300
commit90effdcd2b8a39927aace655c72088a62911e8e1 (patch)
treeee5159c6d1fa0895427b93d1b459224cb1161797 /MAINTAINERS
parent5dc8a864be0820677e7fce85d2832d4387c7bb88 (diff)
downloadlinux-90effdcd2b8a39927aace655c72088a62911e8e1.tar.xz
Update email addresses in MAINTAINERS and .mailmap
Updating email addresses in MAINTAINERS and .mailmap files. Cc: stable@vger.kernel.org Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 29e22bf887a9..7c326f155001 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6497,6 +6497,7 @@ F: include/uapi/linux/sunrpc/
KERNEL SELFTEST FRAMEWORK
M: Shuah Khan <shuahkh@osg.samsung.com>
+M: Shuah Khan <shuah@kernel.org>
L: linux-kselftest@vger.kernel.org
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 <valentina.manea.m@gmail.com>
-M: Shuah Khan <shuah.kh@samsung.com>
+M: Shuah Khan <shuahkh@osg.samsung.com>
+M: Shuah Khan <shuah@kernel.org>
L: linux-usb@vger.kernel.org
S: Maintained
F: Documentation/usb/usbip_protocol.txt