Merge 3.4-rc5 into staging-next

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bb76fc4..216dbf3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3384,6 +3384,7 @@ IIO SUBSYSTEM AND DRIVERS
 M:     Jonathan Cameron <jic23@cam.ac.uk>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
+F:     drivers/iio/
 F:     drivers/staging/iio/
 
 IKANOS/ADI EAGLE ADSL USB DRIVER