Merge tag 'iio-for-4.18a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index afc87293d7869d38863102eeac19dce7fd824ca9..4b65225d443ad783ff991cf15a8aa92641d3c167 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -794,6 +794,14 @@ M: Michael Hanselmann <linux-kernel@hansmi.ch>
 S:     Supported
 F:     drivers/macintosh/ams/
 
+ANALOG DEVICES INC AD5686 DRIVER
+M:     Stefan Popa <stefan.popa@analog.com>
+L:     linux-pm@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/dac/ad5686*
+F:     drivers/iio/dac/ad5696*
+
 ANALOG DEVICES INC AD9389B DRIVER
 M:     Hans Verkuil <hans.verkuil@cisco.com>
 L:     linux-media@vger.kernel.org
@@ -6914,6 +6922,15 @@ F:       drivers/staging/iio/
 F:     include/linux/iio/
 F:     tools/iio/
 
+IIO UNIT CONVERTER
+M:     Peter Rosin <peda@axentia.se>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/iio/afe/current-sense-amplifier.txt
+F:     Documentation/devicetree/bindings/iio/afe/current-sense-shunt.txt
+F:     Documentation/devicetree/bindings/iio/afe/voltage-divider.txt
+F:     drivers/iio/afe/iio-rescale.c
+
 IKANOS/ADI EAGLE ADSL USB DRIVER
 M:     Matthieu Castet <castet.matthieu@free.fr>
 M:     Stanislaw Gruszka <stf_xl@wp.pl>