Merge 4.3-rc5 into staging-next

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 5f467845ef725f42cca522e9f02bf93292c42d4a..cbdbdb64853d94ea51f3ab8ed7b968766a79ee65 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6918,6 +6918,13 @@ S:       Supported
 F:     include/linux/mlx5/
 F:     drivers/infiniband/hw/mlx5/
 
+MELEXIS MLX90614 DRIVER
+M:     Crt Mori <cmo@melexis.com>
+L:     linux-iio@vger.kernel.org
+W:     http://www.melexis.com
+S:     Supported
+F:     drivers/iio/temperature/mlx90614.c
+
 MN88472 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -9978,8 +9985,10 @@ F:       drivers/staging/vt665?/
 STAGING - WILC1000 WIFI DRIVER
 M:     Johnny Kim <johnny.kim@atmel.com>
 M:     Rachel Kim <rachel.kim@atmel.com>
-M:     Dean Lee <dean.lee@atmel.com>
 M:     Chris Park <chris.park@atmel.com>
+M:     Tony Cho <tony.cho@atmel.com>
+M:     Glen Lee <glen.lee@atmel.com>
+M:     Leo Kim <leo.kim@atmel.com>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
 F:     drivers/staging/wilc1000/