Merge tag 'v2022.01-rc3' into next

[platform/kernel/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e718ad2..9045e50 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -115,6 +115,7 @@ F:  arch/arm/include/asm/arch-m1/
 F:     arch/arm/mach-apple/
 F:     configs/apple_m1_defconfig
 F:     drivers/iommu/apple_dart.c
+F:     drivers/pinctrl/pinctrl-apple.c
 F:     include/configs/apple.h
 
 ARM
@@ -761,6 +762,13 @@ F: test/env/
 F:     tools/env*
 F:     tools/mkenvimage.c
 
+ENVIRONMENT AS TEXT
+M:     Simon Glass <sjg@chromium.org>
+R:     Wolfgang Denk <wd@denx.de>
+S:     Maintained
+F:     doc/usage/environment.rst
+F:     scripts/env2string.awk
+
 FASTBOOT
 S:     Orphaned
 F:     cmd/fastboot.c