From fdd187ce49c0bfba920d010767e61c914f087b9b Mon Sep 17 00:00:00 2001
From: Pawel Osciak <pawel@osciak.com>
Date: Sun, 13 Mar 2011 15:20:22 -0300
Subject: [PATCH] --- yaml --- r: 242097 b: refs/heads/master c:
 f0e3b646ccce66c9e878966227ce8415d3c11c2a h: refs/heads/master i:   242095:
 7e90c6bfd29c862d51f1bbd6dcbc8f33b9fb504b v: v3

---
 [refs]                                     |  2 +-
 trunk/Documentation/DocBook/v4l/compat.xml | 13 ++++---------
 trunk/Documentation/DocBook/v4l/v4l2.xml   | 13 ++-----------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index e52fad51c44e..236363e0bbdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ed9d56086acb3bb4ec003ff6d2f54313774d72b
+refs/heads/master: f0e3b646ccce66c9e878966227ce8415d3c11c2a
diff --git a/trunk/Documentation/DocBook/v4l/compat.xml b/trunk/Documentation/DocBook/v4l/compat.xml
index 4d74bf24e114..9f7cd4f25792 100644
--- a/trunk/Documentation/DocBook/v4l/compat.xml
+++ b/trunk/Documentation/DocBook/v4l/compat.xml
@@ -2354,8 +2354,11 @@ that used it. It was originally scheduled for removal in 2.6.35.
       </orderedlist>
     </section>
     <section>
-      <title>V4L2 in Linux 2.6.38</title>
+      <title>V4L2 in Linux 2.6.39</title>
       <orderedlist>
+        <listitem>
+          <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para>
+        </listitem>
         <listitem>
           <para>Multi-planar API added. Does not affect the compatibility of
           current drivers and applications. See
@@ -2364,14 +2367,6 @@ that used it. It was originally scheduled for removal in 2.6.35.
         </listitem>
       </orderedlist>
     </section>
-    <section>
-      <title>V4L2 in Linux 2.6.39</title>
-      <orderedlist>
-        <listitem>
-          <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para>
-        </listitem>
-      </orderedlist>
-    </section>
 
     <section id="other">
       <title>Relation of V4L2 to other Linux multimedia APIs</title>
diff --git a/trunk/Documentation/DocBook/v4l/v4l2.xml b/trunk/Documentation/DocBook/v4l/v4l2.xml
index ae7a069d61d5..a7fd76d0dac1 100644
--- a/trunk/Documentation/DocBook/v4l/v4l2.xml
+++ b/trunk/Documentation/DocBook/v4l/v4l2.xml
@@ -130,17 +130,8 @@ applications. -->
       <revision>
 	<revnumber>2.6.39</revnumber>
 	<date>2011-03-01</date>
-	<authorinitials>mcc</authorinitials>
-	<revremark>Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes.
-	</revremark>
-      </revision>
-
-      <revision>
-	<revnumber>2.6.38</revnumber>
-	<date>2011-01-16</date>
-	<authorinitials>po</authorinitials>
-	<revremark>Added the <link linkend="planar-apis">multi-planar API</link>.
-	</revremark>
+	<authorinitials>mcc, po</authorinitials>
+	<revremark>Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes. Added the <link linkend="planar-apis">multi-planar API</link>.</revremark>
       </revision>
 
       <revision>