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

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index aefa94841ff3eee6cc124221ab4bcb56dd7d4ca3..1c047098d887cd82772a091d9a202ba0353a618c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -685,6 +685,17 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org/
 S:     Supported
 F:     sound/soc/blackfin/*
+ 
+ANALOG DEVICES INC IIO DRIVERS
+M:     Lars-Peter Clausen <lars@metafoo.de>
+M:     Michael Hennerich <Michael.Hennerich@analog.com>
+W:     http://wiki.analog.com/
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/*/ad*
+X:     drivers/iio/*/adjd*
+F:     drivers/staging/iio/*/ad*
+F:     staging/iio/trigger/iio-trig-bfin-timer.c
 
 AOA (Apple Onboard Audio) ALSA DRIVER
 M:     Johannes Berg <johannes@sipsolutions.net>
@@ -4580,6 +4591,9 @@ F:        drivers/media/rc/iguanair.c
 
 IIO SUBSYSTEM AND DRIVERS
 M:     Jonathan Cameron <jic23@kernel.org>
+R:     Hartmut Knaack <knaack.h@gmx.de>
+R:     Lars-Peter Clausen <lars@metafoo.de>
+R:     Peter Meerwald <pmeerw@pmeerw.net>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
 F:     drivers/iio/