[PATCH v2] MAINTAINERS: Update SH/SoCFPGA/USB email addresses

[Marek Vasut]

Update the email addresses to a valid one.
Use N: usb to match on all USB related bits.

Signed-off-by: Marek Vasut <marek.vasut+renesas at mailbox.org>
---
Cc: Quentin Schulz <quentin.schulz at cherry.de>
Cc: Tom Rini <trini at konsulko.com>
---
V2: Fix mailmap
---
 .mailmap    |  7 ++++---
 MAINTAINERS | 12 ++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.mailmap b/.mailmap
index 76ba0a7fea3..8035490a19a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -85,9 +85,10 @@ Love Kumar <love.kumar at amd.com> <love.kumar at xilinx.com>
 Lukasz Majewski <lukma at denx.de>
 Marek Behún <kabel at kernel.org> <marek.behun at nic.cz>
 Marek Behún <kabel at kernel.org> Marek Behun <marek.behun at nic.cz>
-Marek Vasut <marex at denx.de> <marek.vasut+renesas at gmail.com>
-Marek Vasut <marex at denx.de> <marek.vasut at gmail.com>
-Marek Vasut <marex at denx.de> <marex at denx.de>
+Marek Vasut <marek.vasut+renesas at mailbox.org> <marek.vasut+renesas at gmail.com>
+Marek Vasut <marek.vasut+uboot at mailbox.org> <marek.vasut at gmail.com>
+Marek Vasut <marex at nabladev.com> <marex at denx.de>
+Marek Vasut <marex at nabladev.com> <marex at denx.de>
 Markus Klotzbuecher <mk at denx.de>
 Masahiro Yamada <masahiroy at kernel.org> <yamada.m at jp.panasonic.com>
 Masahiro Yamada <masahiroy at kernel.org> <yamada.masahiro at socionext.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 45e9076de67..d92d3951dc2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -162,7 +162,7 @@ F:	arch/arm/dts/Makefile
 F:	cmd/arm/
 
 ARM ALTERA SOCFPGA
-M:	Marek Vasut <marex at denx.de>
+M:	Marek Vasut <marek.vasut+socfpga at mailbox.org>
 M:	Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com>
 M:	Tien Fong Chee <tien.fong.chee at altera.com>
 S:	Maintained
@@ -1726,7 +1726,7 @@ F:	cmd/printf.c
 F:	doc/usage/setexpr.rst
 
 SH
-M:	Marek Vasut <marek.vasut+renesas at gmail.com>
+M:	Marek Vasut <marek.vasut+renesas at mailbox.org>
 M:	Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
 S:	Maintained
 T:	git https://source.denx.de/u-boot/custodians/u-boot-sh.git
@@ -1939,14 +1939,10 @@ F:	test/boot/upl.c
 F:	test/py/tests/test_upl.py
 
 USB
-M:	Marek Vasut <marex at denx.de>
+M:	Marek Vasut <marek.vasut+usb at mailbox.org>
 S:	Maintained
 T:	git https://source.denx.de/u-boot/custodians/u-boot-usb.git
-F:	drivers/usb/
-F:	common/usb.c
-F:	common/usb_kbd.c
-F:	common/usb_storage.c
-F:	include/usb.h
+N:	usb
 
 USB TCPM
 M:	Sebastian Reichel <sebastian.reichel at collabora.com>
-- 
2.53.0