From a1a22d50ae18d252bccab10d31097d578c9c3044 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 24 Nov 2011 19:22:10 -0200
Subject: [PATCH] --- yaml --- r: 276851 b: refs/heads/master c:
 ffe06198876a3cbda1cd642883adcec5304d9442 h: refs/heads/master i:   276849:
 a6590f77e8c47cf4b0ffdb3020a95adb15fb83eb   276847:
 243d9944b9dc4f5ffc180c1382b31faabcd1578a v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bcaa93c539d5..1cd953b72bb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 576b849ea7af9ac05dca3ca92bc62c7528e8f0ef
+refs/heads/master: ffe06198876a3cbda1cd642883adcec5304d9442
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index e839b95b2723..273b0498e715 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -4234,7 +4234,9 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:	Maintained
 F:	Documentation/dvb/
 F:	Documentation/video4linux/
+F:	Documentation/DocBook/media/
 F:	drivers/media/
+F:	drivers/staging/media/
 F:	include/media/
 F:	include/linux/dvb/
 F:	include/linux/videodev*.h