Merge 3.16-rc2 into staging-next

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3f2e171047b90e8a3f396a9c1266a3d5f6c220a2..1a3564dddcb77781b98952da8a0ec8d5906fdc96 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8513,14 +8513,6 @@ M:       H Hartley Sweeten <hsweeten@visionengravers.com>
 S:     Odd Fixes
 F:     drivers/staging/comedi/
 
-STAGING - CRYSTAL HD VIDEO DECODER
-M:     Naren Sankar <nsankar@broadcom.com>
-M:     Jarod Wilson <jarod@wilsonet.com>
-M:     Scott Davilla <davilla@4pi.com>
-M:     Manu Abraham <abraham.manu@gmail.com>
-S:     Odd Fixes
-F:     drivers/staging/crystalhd/
-
 STAGING - ECHO CANCELLER
 M:     Steve Underwood <steveu@coppice.org>
 M:     David Rowe <david@rowetel.com>