Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f1d8800f49942fe92528bb09226300fa49d4e421..e7874c4d83f097852542bd1f9d5ee3bb2a13e60d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2092,6 +2092,7 @@ F:        drivers/rtc/rtc-pl031.c
 F:     drivers/watchdog/coh901327_wdt.c
 F:     Documentation/devicetree/bindings/arm/ste-*
 F:     Documentation/devicetree/bindings/arm/ux500/
+F:     Documentation/devicetree/bindings/arm/ux500.yaml
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
 
 ARM/NUVOTON NPCM ARCHITECTURE
@@ -3288,6 +3289,8 @@ S:        Maintained
 N:     bcm2711
 N:     bcm2835
 F:     drivers/staging/vc04_services
+F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
+F:     drivers/pci/controller/pcie-brcmstb.c
 
 BROADCOM BCM47XX MIPS ARCHITECTURE
 M:     Hauke Mehrtens <hauke@hauke-m.de>
@@ -3343,6 +3346,8 @@ F:        drivers/bus/brcmstb_gisb.c
 F:     arch/arm/mm/cache-b15-rac.c
 F:     arch/arm/include/asm/hardware/cache-b15-rac.h
 N:     brcmstb
+F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
+F:     drivers/pci/controller/pcie-brcmstb.c
 
 BROADCOM BMIPS CPUFREQ DRIVER
 M:     Markus Mayer <mmayer@broadcom.com>
@@ -6903,7 +6908,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
 S:     Maintained
 F:     fs/fuse/
 F:     include/uapi/linux/fuse.h
-F:     Documentation/filesystems/fuse.txt
+F:     Documentation/filesystems/fuse.rst
 
 FUTEX SUBSYSTEM
 M:     Thomas Gleixner <tglx@linutronix.de>
@@ -7814,9 +7819,7 @@ M:        Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     Documentation/i2c/busses/i2c-parport.rst
-F:     Documentation/i2c/busses/i2c-parport-light.rst
 F:     drivers/i2c/busses/i2c-parport.c
-F:     drivers/i2c/busses/i2c-parport-light.c
 
 I2C SUBSYSTEM
 M:     Wolfram Sang <wsa@the-dreams.de>
@@ -16149,6 +16152,7 @@ F:      drivers/firmware/arm_scpi.c
 F:     drivers/firmware/arm_scmi/
 F:     drivers/reset/reset-scmi.c
 F:     include/linux/sc[mp]i_protocol.h
+F:     include/trace/events/scmi.h
 
 SYSTEM RESET/SHUTDOWN DRIVERS
 M:     Sebastian Reichel <sre@kernel.org>