Merge tag 'iio-for-v4.2c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d8afd29536786b0907c795afeb8cd5aa3ff2d3b6..ad98c7ffa4b243001dd290464f015b40b81e7c30 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9500,6 +9500,15 @@ M:       Forest Bond <forest@alittletooquiet.net>
 S:     Odd Fixes
 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>
+L:     linux-wireless@vger.kernel.org
+S:     Supported
+F:     drivers/staging/wilc1000/
+
 STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
 M:     Arnaud Patard <arnaud.patard@rtp-net.org>
 S:     Odd Fixes