Updating email addresses in MAINTAINERS and .mailmap files. Cc: [email protected] Signed-off-by: Shuah Khan <[email protected]> --- .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 <[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 index ed42cb6..5e94e6e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6486,6 +6486,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 @@ -11887,7 +11888,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 -- 2.7.4
