Merge tag 'mfd-for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[mirror_ubuntu-bionic-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ca6f5f7a4752506bd32ac3339466ba8a83b0f227..7515e66945af00ecef4df178e83bdbeb1adf6e77 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3926,10 +3926,13 @@ S:      Maintained
 F:     drivers/i2c/busses/i2c-diolan-u2c.c
 
 DIRECT ACCESS (DAX)
-M:     Matthew Wilcox <willy@linux.intel.com>
+M:     Matthew Wilcox <mawilcox@microsoft.com>
+M:     Ross Zwisler <ross.zwisler@linux.intel.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Supported
 F:     fs/dax.c
+F:     include/linux/dax.h
+F:     include/trace/events/fs_dax.h
 
 DIRECTORY NOTIFICATION (DNOTIFY)
 M:     Eric Paris <eparis@parisplace.org>
@@ -8473,6 +8476,7 @@ S:        Supported
 F:     Documentation/devicetree/bindings/mfd/
 F:     drivers/mfd/
 F:     include/linux/mfd/
+F:     include/dt-bindings/mfd/
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 M:     Ulf Hansson <ulf.hansson@linaro.org>