diff --git a/[refs] b/[refs]
index 3ea63009de08..5bd889a09c84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c28eb66292598f3d5d8c687be7425a80cb2143af
+refs/heads/master: f96236e585e2ba0e746c12dee79b54bc121d688b
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 2bf8543c650c..124c44c3cbb7 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1728,7 +1728,7 @@ M:	Mauro Carvalho Chehab <mchehab@redhat.com>
 L:	linux-media@vger.kernel.org
 W:	http://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
-S:	Maintained
+S:	Odd fixes
 F:	Documentation/video4linux/bttv/
 F:	drivers/media/pci/bt8xx/bttv*