Merge branch '2019-10-15-master-imports'
[oweals/u-boot.git] / MAINTAINERS
index 6af9816a4a08bf0f51d4e7aea9a630b4db82c5ad..bdc998a55e113855962e9a28106a64437ee27c32 100644 (file)
@@ -102,7 +102,7 @@ F:  doc/device-tree-bindings/mmc/snps,dw-mmc.txt
 F:     drivers/mmc/snps_dw_mmc.c
 
 ARM
-M:     Albert Aribaud <albert.u.boot@aribaud.net>
+M:     Tom Rini <trini@konsulko.com>
 S:     Maintained
 T:     git https://gitlab.denx.de/u-boot/custodians/u-boot-arm.git
 F:     arch/arm/
@@ -461,6 +461,7 @@ F:  drivers/timer/cadence-ttc.c
 F:     drivers/usb/host/ehci-zynq.c
 F:     drivers/watchdog/cdns_wdt.c
 F:     include/zynqmppl.h
+F:     include/zynqmp_firmware.h
 F:     tools/zynqmp*
 N:     ultra96
 N:     zynqmp