Merge git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index dd92af51820817ccab670598922bc4839fd0a427..8add9d4c2ae9b5effc5c62c1c27d0ae0d854d1d8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -244,9 +244,12 @@ S: Maintained
 F:     arch/arm/mach-mediatek/
 F:     arch/arm/include/asm/arch-mediatek/
 F:     board/mediatek/
+F:     doc/device-tree-bindings/phy/phy-mtk-*
+F:     doc/device-tree-bindings/usb/mediatek,*
 F:     doc/README.mediatek
 F:     drivers/clk/mediatek/
 F:     drivers/mmc/mtk-sd.c
+F:     drivers/phy/phy-mtk-*
 F:     drivers/pinctrl/mediatek/
 F:     drivers/power/domain/mtk-power-domain.c
 F:     drivers/ram/mediatek/
@@ -625,12 +628,19 @@ F:        include/asm-generic/pe.h
 F:     lib/charset.c
 F:     lib/efi*/
 F:     test/py/tests/test_efi*
+F:     test/py/tests/test_efi*/
 F:     test/unicode_ut.c
 F:     cmd/bootefi.c
 F:     cmd/efidebug.c
 F:     cmd/nvedit_efi.c
 F:     tools/file2include.c
 
+EFI VARIABLES VIA OP-TEE
+M:     Ilias Apalodimas <ilias.apalodimas@linaro.org>
+S:     Maintained
+F:     lib/efi_loader/efi_variable_tee.c
+F:     include/mm_communication.h
+
 ENVIRONMENT
 M:     Joe Hershberger <joe.hershberger@ni.com>
 R:     Wolfgang Denk <wd@denx.de>
@@ -814,7 +824,7 @@ S:  Maintained
 F:     arch/powerpc/
 
 POWERPC MPC8XX
-M:     Christophe Leroy <christophe.leroy@c-s.fr>
+M:     Christophe Leroy <christophe.leroy@csgroup.eu>
 S:     Maintained
 T:     git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc8xx.git
 F:     arch/powerpc/cpu/mpc8xx/