Merge branch 'master' of git://git.denx.de/u-boot
[oweals/u-boot.git] / MAINTAINERS
index 0ee358bac6bd455aa35d49ee9f5ae5090d760f3f..ec59ce8b8802658b2caf6de5f7a59da2761cb9b2 100644 (file)
@@ -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/
@@ -272,9 +275,11 @@ M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 S:     Maintained
 F:     arch/arm/include/asm/arch-owl/
 F:     arch/arm/mach-owl/
-F:     board/ucRobotics/
 F:     drivers/clk/owl/
 F:     drivers/serial/serial_owl.c
+F:     include/configs/owl-common.h
+F:     configs/bubblegum_96_defconfig
+F:     configs/cubieboard7_defconfig
 
 ARM RENESAS RMOBILE/R-CAR
 M:     Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
@@ -623,6 +628,7 @@ 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