Merge tag 'staging-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8ea5ae35d72095ab81fffa8774c3e97676c04f22..87ae13cd288cea6a3a00a57d4ba74fd855e03021 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -846,6 +846,14 @@ S: Supported
 F:     drivers/iio/dac/ad5758.c
 F:     Documentation/devicetree/bindings/iio/dac/ad5758.txt
 
+ANALOG DEVICES INC AD7124 DRIVER
+M:     Stefan Popa <stefan.popa@analog.com>
+L:     linux-iio@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/iio/adc/ad7124.c
+F:     Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
+
 ANALOG DEVICES INC AD9389B DRIVER
 M:     Hans Verkuil <hans.verkuil@cisco.com>
 L:     linux-media@vger.kernel.org
@@ -6906,6 +6914,14 @@ L:       linux-input@vger.kernel.org
 S:     Maintained
 F:     drivers/input/touchscreen/htcpen.c
 
+HTS221 TEMPERATURE-HUMIDITY IIO DRIVER
+M:     Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+L:     linux-iio@vger.kernel.org
+W:     http://www.st.com/
+S:     Maintained
+F:     drivers/iio/humidity/hts221*
+F:     Documentation/devicetree/bindings/iio/humidity/hts221.txt
+
 HUAWEI ETHERNET DRIVER
 M:     Aviad Krawczyk <aviad.krawczyk@huawei.com>
 L:     netdev@vger.kernel.org
@@ -12055,6 +12071,13 @@ M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 S:     Maintained
 F:     drivers/pnp/
 
+PNI RM3100 IIO DRIVER
+M:     Song Qiang <songqiang1304521@gmail.com>
+L:     linux-iio@vger.kernel.org
+S:     Maintained
+F:     drivers/iio/magnetometer/rm3100*
+F:     Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
+
 POSIX CLOCKS and TIMERS
 M:     Thomas Gleixner <tglx@linutronix.de>
 L:     linux-kernel@vger.kernel.org
@@ -12840,7 +12863,8 @@ RENESAS R-CAR GYROADC DRIVER
 M:     Marek Vasut <marek.vasut@gmail.com>
 L:     linux-iio@vger.kernel.org
 S:     Supported
-F:     drivers/iio/adc/rcar_gyro_adc.c
+F:     Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt
+F:     drivers/iio/adc/rcar-gyroadc.c
 
 RENESAS R-CAR I2C DRIVERS
 M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
@@ -14275,6 +14299,14 @@ M:     Jan-Benedict Glaw <jbglaw@lug-owl.de>
 S:     Maintained
 F:     arch/alpha/kernel/srm_env.c
 
+ST LSM6DSx IMU IIO DRIVER
+M:     Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+L:     linux-iio@vger.kernel.org
+W:     http://www.st.com/
+S:     Maintained
+F:     drivers/iio/imu/st_lsm6dsx/
+F:     Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
+
 ST STM32 I2C/SMBUS DRIVER
 M:     Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
 L:     linux-i2c@vger.kernel.org
@@ -14360,8 +14392,8 @@ S:      Odd Fixes
 F:     drivers/staging/vt665?/
 
 STAGING - WILC1000 WIFI DRIVER
-M:     Aditya Shankar <aditya.shankar@microchip.com>
-M:     Ganesh Krishna <ganesh.krishna@microchip.com>
+M:     Adham Abozaeid <adham.abozaeid@microchip.com>
+M:     Ajay Singh <ajay.kathat@microchip.com>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
 F:     drivers/staging/wilc1000/