Updating email addresses in MAINTAINERS and .mailmap files. Cc: sta...@vger.kernel.org Signed-off-by: Shuah Khan <shua...@osg.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.shilim...@oracle.org> Sascha Hauer <s.ha...@pengutronix.de> S.Çağlar Onur <cag...@pardus.org.tr> Shiraz Hashim <shiraz.linux.ker...@gmail.com> <shiraz.has...@st.com> +Shuah Khan <sh...@kernel.org> <shuahk...@gmail.com> <shuah.k...@hp.com> <shua...@osg.samsung.com> <shuah...@samsung.com> Simon Kelley <si...@thekelleys.org.uk> Stéphane Witzmann <stephane.witzm...@ubpmes.univ-bpclermont.fr> Stephen Hemminger <shemmin...@osdl.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 <shua...@osg.samsung.com> +M: Shuah Khan <sh...@kernel.org> L: linux-kselft...@vger.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.mane...@gmail.com> -M: Shuah Khan <shuah...@samsung.com> +M: Shuah Khan <shua...@osg.samsung.com> +M: Shuah Khan <sh...@kernel.org> L: linux-...@vger.kernel.org S: Maintained F: Documentation/usb/usbip_protocol.txt -- 2.7.4
