Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5a0d1d4a905d8912b7337b9a3fb06fcdae4883f9..39e75bbefc3d734b79f40485288bb25be98b91c1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7890,6 +7890,18 @@ L:       linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/ioc3_serial.c
 
+IOMAP FILESYSTEM LIBRARY
+M:     Christoph Hellwig <hch@infradead.org>
+M:     Darrick J. Wong <darrick.wong@oracle.com>
+M:     linux-xfs@vger.kernel.org
+M:     linux-fsdevel@vger.kernel.org
+L:     linux-xfs@vger.kernel.org
+L:     linux-fsdevel@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
+S:     Supported
+F:     fs/iomap.c
+F:     include/linux/iomap.h
+
 IOMMU DRIVERS
 M:     Joerg Roedel <joro@8bytes.org>
 L:     iommu@lists.linux-foundation.org
@@ -9097,6 +9109,11 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/phy/marvell10g.c
 
+MARVELL MVEBU THERMAL DRIVER
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+S:     Maintained
+F:     drivers/thermal/armada_thermal.c
+
 MARVELL MVNETA ETHERNET DRIVER
 M:     Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 L:     netdev@vger.kernel.org