From d4fb9777cf8639fc30959e638023f98a2011afb9 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Fri, 3 Feb 2012 15:37:12 -0800
Subject: [PATCH] --- yaml --- r: 287208 b: refs/heads/master c:
 cdb7232b29229ecf1cc89764d75074eaee63ce32 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fb949652e889..55571b01839d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0960e7d13f5d33e4a8201b6c546ce60a2c6faba4
+refs/heads/master: cdb7232b29229ecf1cc89764d75074eaee63ce32
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index a9fd6ca540f2..51767d58706a 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/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