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

[linux-drm-fsl-dcu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 71a65389ca4d8756d5f4f252b99e4b8bc34ce446..348f5c16ef503460e72f68e3f55e624cf9ebd485 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2399,6 +2399,12 @@ F:       security/capability.c
 F:     security/commoncap.c
 F:     kernel/capability.c
 
+CAPELLA MICROSYSTEMS LIGHT SENSOR DRIVER
+M:     Kevin Tsai <ktsai@capellamicro.com>
+S:     Maintained
+F:     drivers/iio/light/cm*
+F:     Documentation/devicetree/bindings/i2c/trivial-devices.txt
+
 CC2520 IEEE-802.15.4 RADIO DRIVER
 M:     Varka Bhadram <varkabhadram@gmail.com>
 L:     linux-wpan@vger.kernel.org
@@ -3904,6 +3910,12 @@ S:       Supported
 F:     Documentation/fault-injection/
 F:     lib/fault-inject.c
 
+FBTFT Framebuffer drivers
+M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+M:     Noralf Trønnes <noralf@tronnes.org>
+S:     Maintained
+F:     drivers/staging/fbtft/
+
 FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
 M:     Robert Love <robert.w.love@intel.com>
 L:     fcoe-devel@open-fcoe.org
@@ -9262,6 +9274,14 @@ L:       linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/rtl8723au/
 
+STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
+M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+M:     Teddy Wang <teddy.wang@siliconmotion.com>
+M:     Sudip Mukherjee <sudip@vectorindia.org>
+L:     linux-fbdev@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/sm7xxfb/
+
 STAGING - SLICOSS
 M:     Lior Dotan <liodot@gmail.com>
 M:     Christopher Harrer <charrer@alacritech.com>