Merge branches 'clk-samsung', 'clk-mtk', 'clk-rm', 'clk-ast' and 'clk-qcom' into...

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3ab163e..1909dd5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2178,7 +2178,7 @@ M:        Jean-Marie Verdun <verdun@hpe.com>
 M:     Nick Hawkins <nick.hawkins@hpe.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/hpe,gxp.yaml
-F:     Documentation/devicetree/bindings/spi/hpe,gxp-spi.yaml
+F:     Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
 F:     Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
 F:     arch/arm/boot/dts/hpe-bmc*
 F:     arch/arm/boot/dts/hpe-gxp*
@@ -4957,7 +4957,7 @@ F:        drivers/hwmon/lochnagar-hwmon.c
 F:     drivers/mfd/lochnagar-i2c.c
 F:     drivers/pinctrl/cirrus/pinctrl-lochnagar.c
 F:     drivers/regulator/lochnagar-regulator.c
-F:     include/dt-bindings/clk/lochnagar.h
+F:     include/dt-bindings/clock/lochnagar.h
 F:     include/dt-bindings/pinctrl/lochnagar.h
 F:     include/linux/mfd/lochnagar*
 F:     sound/soc/codecs/lochnagar-sc.c
@@ -5145,6 +5145,7 @@ T:        git git://git.samba.org/sfrench/cifs-2.6.git
 F:     Documentation/admin-guide/cifs/
 F:     fs/cifs/
 F:     fs/smbfs_common/
+F:     include/uapi/linux/cifs
 
 COMPACTPCI HOTPLUG CORE
 M:     Scott Murray <scott@spiteful.org>