Updating email addresses in MAINTAINERS and .mailmap files. Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx> --- .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.shilimkar@xxxxxxxxxx> Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> S.Çağlar Onur <caglar@xxxxxxxxxxxxx> Shiraz Hashim <shiraz.linux.kernel@xxxxxxxxx> <shiraz.hashim@xxxxxx> +Shuah Khan <shuah@xxxxxxxxxx> <shuahkhan@xxxxxxxxx> <shuah.khan@xxxxxx> <shuahkh@xxxxxxxxxxxxxxx> <shuah.kh@xxxxxxxxxxx> Simon Kelley <simon@xxxxxxxxxxxxxxxxx> Stéphane Witzmann <stephane.witzmann@xxxxxxxxxxxxxxxxxxxxxxxxx> Stephen Hemminger <shemminger@xxxxxxxx> 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 <shuahkh@xxxxxxxxxxxxxxx> +M: Shuah Khan <shuah@xxxxxxxxxx> L: linux-kselftest@xxxxxxxxxxxxxxx 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.manea.m@xxxxxxxxx> -M: Shuah Khan <shuah.kh@xxxxxxxxxxx> +M: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx> +M: Shuah Khan <shuah@xxxxxxxxxx> L: linux-usb@xxxxxxxxxxxxxxx S: Maintained F: Documentation/usb/usbip_protocol.txt -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html