Merge 5.1-rc6 into staging-next

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 09f43f1bdd15eb92acb67e22891c3b4575c71b1b..4868292c0d8ba74ee1f95113c9b671c326c85bb1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -868,7 +868,7 @@ L:  linux-iio@vger.kernel.org
 W:     http://ez.analog.com/community/linux-device-drivers
 S:     Supported
 F:     drivers/iio/adc/ad7606.c
-F:     Documentation/devicetree/bindings/iio/adc/ad7606.txt
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt
 
 ANALOG DEVICES INC AD7768-1 DRIVER
 M:     Stefan Popa <stefan.popa@analog.com>
@@ -950,6 +950,7 @@ F:  drivers/dma/dma-axi-dmac.c
 ANALOG DEVICES INC IIO DRIVERS
 M:     Lars-Peter Clausen <lars@metafoo.de>
 M:     Michael Hennerich <Michael.Hennerich@analog.com>
+M:     Stefan Popa <stefan.popa@analog.com>
 W:     http://wiki.analog.com/
 W:     http://ez.analog.com/community/linux-device-drivers
 S:     Supported
@@ -9406,6 +9407,13 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/sound/max9860.txt
 F:     sound/soc/codecs/max9860.*
 
+MAXBOTIX ULTRASONIC RANGER IIO DRIVER
+M:     Andreas Klinger <ak@it-klinger.de>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
+F:     drivers/iio/proximity/mb1232.c
+
 MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
 M:     Javier Martinez Canillas <javier@dowhile0.org>
 L:     linux-kernel@vger.kernel.org