Merge tag 'chrome-platform-for-linus-4.18' of git://git.kernel.org/pub/scm/linux...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c125f705f78f496de8f0a388205bd0111227ae7..aa2031ee7d18d0f22aa5b8faee8ef38999ba5585 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4330,12 +4330,14 @@ W:      http://git.infradead.org/users/hch/dma-mapping.git
 S:     Supported
 F:     lib/dma-debug.c
 F:     lib/dma-direct.c
+F:     lib/dma-noncoherent.c
 F:     lib/dma-virt.c
 F:     drivers/base/dma-mapping.c
 F:     drivers/base/dma-coherent.c
 F:     include/asm-generic/dma-mapping.h
 F:     include/linux/dma-direct.h
 F:     include/linux/dma-mapping.h
+F:     include/linux/dma-noncoherent.h
 
 DME1737 HARDWARE MONITOR DRIVER
 M:     Juerg Haefliger <juergh@gmail.com>
@@ -6217,6 +6219,7 @@ L:        linux-hwmon@vger.kernel.org
 W:     http://hwmon.wiki.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/
 F:     Documentation/hwmon/
 F:     drivers/hwmon/
 F:     include/linux/hwmon*.h
@@ -9700,7 +9703,7 @@ S:        Maintained
 F:     drivers/net/ethernet/netronome/
 
 NETWORK BLOCK DEVICE (NBD)
-M:     Josef Bacik <jbacik@fb.com>
+M:     Josef Bacik <josef@toxicpanda.com>
 S:     Maintained
 L:     linux-block@vger.kernel.org
 L:     nbd@other.debian.org