staging: android: ion: Make ION_OF depend on OF_ADDRESS

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6781a3f..1b65477 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -810,11 +810,11 @@ L:        alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/aoa/
 
-APEX EMBEDDED SYSTEMS STX104 DAC DRIVER
+APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
 M:     William Breathitt Gray <vilhelm.gray@gmail.com>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
-F:     drivers/iio/dac/stx104.c
+F:     drivers/iio/adc/stx104.c
 
 APM DRIVER
 M:     Jiri Kosina <jikos@kernel.org>
@@ -1975,6 +1975,13 @@ S:       Maintained
 F:     drivers/media/i2c/as3645a.c
 F:     include/media/i2c/as3645a.h
 
+ASAHI KASEI AK8974 DRIVER
+M:     Linus Walleij <linus.walleij@linaro.org>
+L:     linux-iio@vger.kernel.org
+W:     http://www.akm.com/
+S:     Supported
+F:     drivers/iio/magnetometer/ak8974.c
+
 ASC7621 HARDWARE MONITOR DRIVER
 M:     George Joseph <george.joseph@fairview5.com>
 L:     linux-hwmon@vger.kernel.org
@@ -7515,6 +7522,12 @@ L:       linux-iio@vger.kernel.org
 S:     Maintained
 F:     drivers/iio/potentiometer/mcp4531.c
 
+MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/dac/cio-dac.c
+
 MEDIA DRIVERS FOR RENESAS - FCP
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -11184,6 +11197,7 @@ F:      drivers/staging/media/lirc/
 STAGING - LUSTRE PARALLEL FILESYSTEM
 M:     Oleg Drokin <oleg.drokin@intel.com>
 M:     Andreas Dilger <andreas.dilger@intel.com>
+M:     James Simmons <jsimmons@infradead.org>
 L:     lustre-devel@lists.lustre.org (moderated for non-subscribers)
 W:     http://wiki.lustre.org/
 S:     Maintained
@@ -11210,13 +11224,6 @@ M:     Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
 S:     Odd Fixes
 F:     drivers/staging/rtl8712/
 
-STAGING - REALTEK RTL8723U WIRELESS DRIVER
-M:     Larry Finger <Larry.Finger@lwfinger.net>
-M:     Jes Sorensen <Jes.Sorensen@redhat.com>
-L:     linux-wireless@vger.kernel.org
-S:     Maintained
-F:     drivers/staging/rtl8723au/
-
 STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
 M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 M:     Teddy Wang <teddy.wang@siliconmotion.com>