summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-02-03 15:37:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-03 16:16:40 -0800
commitcdb7232b29229ecf1cc89764d75074eaee63ce32 (patch)
tree8aa8b97e527f6976b0d1c782495726c485abcfe4
parent0960e7d13f5d33e4a8201b6c546ce60a2c6faba4 (diff)
downloadlinux-3.10-cdb7232b29229ecf1cc89764d75074eaee63ce32.tar.gz
linux-3.10-cdb7232b29229ecf1cc89764d75074eaee63ce32.tar.bz2
linux-3.10-cdb7232b29229ecf1cc89764d75074eaee63ce32.zip
MAINTAINERS: remove staging sections
Two commits moved files from staging to drivers/media/ commit d6ce55de3abcc ("[media] move cx25821 out of staging") commit be30497085080 ("[media] move tm6000 to drivers/media/video") Remove the sections. Signed-off-by: Joe Perches <joe@perches.com> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--MAINTAINERS5
1 files changed, 0 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a9fd6ca540f..51767d58706 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6390,11 +6390,6 @@ M: Omar Ramirez Luna <omar.ramirez@ti.com>
S: Odd Fixes
F: drivers/staging/tidspbridge/
-STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS
-L: linux-media@vger.kernel.org
-S: Odd Fixes
-F: drivers/staging/tm6000/
-
STAGING - USB ENE SM/MS CARD READER DRIVER
M: Al Cho <acho@novell.com>
S: Odd Fixes