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.
- V4L2 in Linux 2.6.38
+ V4L2 in Linux 2.6.39
+
+ The old VIDIOC_*_OLD symbols and V4L1 support were removed.
+ 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.
-
- V4L2 in Linux 2.6.39
-
-
- The old VIDIOC_*_OLD symbols and V4L1 support were removed.
-
-
- Relation of V4L2 to other Linux multimedia APIs
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. -->
2.6.392011-03-01
- mcc
- Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes.
-
-
-
-
- 2.6.38
- 2011-01-16
- po
- Added the multi-planar API.
-
+ mcc, po
+ Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes. Added the multi-planar API.