Merge tag '9p-for-5.10-rc1' of git://github.com/martinetd/linux

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

diff --git a/MAINTAINERS b/MAINTAINERS
index bf7ba6d..60726c8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5231,7 +5231,6 @@ F:        kernel/dma/
 
 DMA-BUF HEAPS FRAMEWORK
 M:     Sumit Semwal <sumit.semwal@linaro.org>
-R:     Andrew F. Davis <afd@ti.com>
 R:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
 R:     Liam Mark <lmark@codeaurora.org>
 R:     Laura Abbott <labbott@redhat.com>
@@ -11160,6 +11159,12 @@ W:     http://www.melfas.com
 F:     Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt
 F:     drivers/input/touchscreen/melfas_mip4.c
 
+MELLANOX BLUEFIELD I2C DRIVER
+M:     Khalil Blaiech <kblaiech@mellanox.com>
+L:     linux-i2c@vger.kernel.org
+S:     Supported
+F:     drivers/i2c/busses/i2c-mlxbf.c
+
 MELLANOX ETHERNET DRIVER (mlx4_en)
 M:     Tariq Toukan <tariqt@nvidia.com>
 L:     netdev@vger.kernel.org
@@ -11605,6 +11610,7 @@ M:      Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 L:     linux-mips@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/mips/mscc.txt
+F:     Documentation/devicetree/bindings/power/reset/ocelot-reset.txt
 F:     arch/mips/boot/dts/mscc/
 F:     arch/mips/configs/generic/board-ocelot.config
 F:     arch/mips/generic/board-ocelot.c
@@ -17391,7 +17397,7 @@ S:      Maintained
 F:     drivers/thermal/ti-soc-thermal/
 
 TI BQ27XXX POWER SUPPLY DRIVER
-R:     Andrew F. Davis <afd@ti.com>
+R:     Dan Murphy <dmurphy@ti.com>
 F:     drivers/power/supply/bq27xxx_battery.c
 F:     drivers/power/supply/bq27xxx_battery_i2c.c
 F:     include/linux/power/bq27xxx_battery.h