Merge tag 'hwmon-for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
[linux-block.git] / MAINTAINERS
index a02437913f010d9cf58f1f75449d08f2aad39b41..4dacb54557e1ffb427497202b82f42bc6e2e71ba 100644 (file)
@@ -2234,13 +2234,16 @@ ARM/HPE GXP ARCHITECTURE
 M:     Jean-Marie Verdun <verdun@hpe.com>
 M:     Nick Hawkins <nick.hawkins@hpe.com>
 S:     Maintained
+F:     Documentation/hwmon/gxp-fan-ctrl.rst
 F:     Documentation/devicetree/bindings/arm/hpe,gxp.yaml
+F:     Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.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*
 F:     arch/arm/mach-hpe/
 F:     drivers/clocksource/timer-gxp.c
+F:     drivers/hwmon/gxp-fan-ctrl.c
 F:     drivers/spi/spi-gxp.c
 F:     drivers/watchdog/gxp-wdt.c
 
@@ -14046,6 +14049,7 @@ M:      Saravanan Sekar <sravanhome@gmail.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/mfd/mps,mp2629.yaml
 F:     Documentation/devicetree/bindings/regulator/mps,mp*.yaml
+F:     drivers/hwmon/pmbus/mpq7932.c
 F:     drivers/iio/adc/mp2629_adc.c
 F:     drivers/mfd/mp2629.c
 F:     drivers/power/supply/mp2629_charger.c
@@ -15481,6 +15485,7 @@ F:      drivers/mtd/nand/onenand/
 F:     include/linux/mtd/onenand*.h
 
 ONEXPLAYER FAN DRIVER
+M:     Derek John Clark <derekjohn.clark@gmail.com>
 M:     Joaquín Ignacio Aramendía <samsagax@gmail.com>
 L:     linux-hwmon@vger.kernel.org
 S:     Maintained