summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap7
-rw-r--r--MAINTAINERS12
2 files changed, 8 insertions, 11 deletions
diff --git a/.mailmap b/.mailmap
index e73b98ae0ae..bcb393e581b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -87,9 +87,10 @@ Love Kumar <[email protected]> <[email protected]>
Lukasz Majewski <[email protected]>
Marek BehĂșn <[email protected]> Marek Behun <[email protected]>
-Marek Vasut <[email protected]> <marex at denx.de>
+Marek Vasut <[email protected]> <marex at denx.de>
Markus Klotzbuecher <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 86ab813aee4..e1379a6a3e7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -168,7 +168,7 @@ F: arch/arm/dts/Makefile
F: cmd/arm/
ARM ALTERA SOCFPGA
-M: Marek Vasut <[email protected]>
+M: Marek Vasut <[email protected]>
M: Simon Goldschmidt <[email protected]>
M: Tien Fong Chee <[email protected]>
S: Maintained
@@ -1655,7 +1655,7 @@ F: cmd/printf.c
F: doc/usage/setexpr.rst
SH
-M: Marek Vasut <[email protected]>
+M: Marek Vasut <[email protected]>
M: Nobuhiro Iwamatsu <[email protected]>
S: Maintained
T: git https://git.u-boot-project.org/u-boot/custodians/u-boot-sh.git
@@ -1869,14 +1869,10 @@ F: test/boot/upl.c
F: test/py/tests/test_upl.py
USB
-M: Marek Vasut <[email protected]>
+M: Marek Vasut <[email protected]>
S: Maintained
T: git https://git.u-boot-project.org/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 <[email protected]>