Staging: sep: Fix missing space after return type in sep_crypto.c

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5aa1c500fe6dd8434d50c88b172454fd071fad44..b44ae3bfa55fb570a7c54be2aa7c862bd078c14e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1860,6 +1860,7 @@ F:        drivers/net/ethernet/broadcom/bnx2x/
 
 BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
 M:     Christian Daudt <bcm@fixthebug.org>
+M:     Matt Porter <mporter@linaro.org>
 L:     bcm-kernel-feedback-list@broadcom.com
 T:     git git://git.github.com/broadcom/bcm11351
 S:     Maintained
@@ -8324,6 +8325,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