Merge 3.14-rc5 into staging-next

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

diff --git a/MAINTAINERS b/MAINTAINERS
index c6d0e93eff62d700443b93dff01120d36d2ce52a..c3ff6236fca881ccccf2a4d6f3904262cbe9380f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8340,6 +8340,12 @@ M:       Teddy Wang <teddy.wang@siliconmotion.com.cn>
 S:     Odd Fixes
 F:     drivers/staging/sm7xxfb/
 
+STAGING - SLICOSS
+M:     Lior Dotan <liodot@gmail.com>
+M:     Christopher Harrer <charrer@alacritech.com>
+S:     Odd Fixes
+F:     drivers/staging/slicoss/
+
 STAGING - SOFTLOGIC 6x10 MPEG CODEC
 M:     Ismael Luceno <ismael.luceno@corp.bluecherry.net>
 S:     Supported