Commit 90effdcd authored Jun 14, 2016 by Shuah Khan Committed by Linus Torvalds Jun 15, 2016

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>

parent 5dc8a864

.mailmap

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -123,6 +123,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
	Sascha Hauer <s.hauer@pengutronix.de>		Sascha Hauer <s.hauer@pengutronix.de>
	S.Çağlar Onur <caglar@pardus.org.tr>		S.Çağlar Onur <caglar@pardus.org.tr>
	Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
			Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	Stephen Hemminger <shemminger@osdl.org>		Stephen Hemminger <shemminger@osdl.org>

MAINTAINERS

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6497,6 +6497,7 @@ F: include/uapi/linux/sunrpc/

	KERNEL SELFTEST FRAMEWORK		KERNEL SELFTEST FRAMEWORK
	M: Shuah Khan <shuahkh@osg.samsung.com>		M: Shuah Khan <shuahkh@osg.samsung.com>
			M: Shuah Khan <shuah@kernel.org>
	L: linux-kselftest@vger.kernel.org		L: linux-kselftest@vger.kernel.org
	T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest		T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest
	S: Maintained		S: Maintained
	@@ -11902,7 +11903,8 @@ F: drivers/usb/common/usb-otg-fsm.c

	USB OVER IP DRIVER		USB OVER IP DRIVER
	M: Valentina Manea <valentina.manea.m@gmail.com>		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		L: linux-usb@vger.kernel.org
	S: Maintained		S: Maintained
	F: Documentation/usb/usbip_protocol.txt		F: Documentation/usb/usbip_protocol.txt