From 60032a595e50836e4e72598734d0497e5dc9a196 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 13 Sep 2012 17:06:34 -0300
Subject: [PATCH] --- yaml --- r: 330946 b: refs/heads/master c:
 3c8139477bc55166fa4c125209d193bd9851af3c h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/Documentation/DocBook/media/v4l/v4l2.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5cab7d5b8ad3..ea44c0a3f834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5266c98b15e682694e4d79590d39416ad3bde687
+refs/heads/master: 3c8139477bc55166fa4c125209d193bd9851af3c
diff --git a/trunk/Documentation/DocBook/media/v4l/v4l2.xml b/trunk/Documentation/DocBook/media/v4l/v4l2.xml
index 10ccde9d16d0..0292ed106887 100644
--- a/trunk/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/trunk/Documentation/DocBook/media/v4l/v4l2.xml
@@ -581,7 +581,6 @@ and discussions on the V4L mailing list.</revremark>
     &sub-subdev-enum-frame-size;
     &sub-subdev-enum-mbus-code;
     &sub-subdev-g-crop;
-    &sub-subdev-g-edid;
     &sub-subdev-g-fmt;
     &sub-subdev-g-frame-interval;
     &sub-subdev-g-selection;