Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / Documentation / DocBook / v4l / v4l2.xml

diff --git a/Documentation/DocBook/v4l/v4l2.xml b/Documentation/DocBook/v4l/v4l2.xml
index a436716..a7fd76d 100644 (file)
--- a/Documentation/DocBook/v4l/v4l2.xml
+++ b/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>
@@ -410,7 +401,7 @@ and discussions on the V4L mailing list.</revremark>
 </partinfo>
 
 <title>Video for Linux Two API Specification</title>
- <subtitle>Revision 2.6.38</subtitle>
+ <subtitle>Revision 2.6.39</subtitle>
 
   <chapter id="common">
     &sub-common;
@@ -510,6 +501,7 @@ and discussions on the V4L mailing list.</revremark>
     &sub-subdev-enum-frame-interval;
     &sub-subdev-enum-frame-size;
     &sub-subdev-enum-mbus-code;
+    &sub-subdev-g-crop;
     &sub-subdev-g-fmt;
     &sub-subdev-g-frame-interval;
     &sub-subscribe-event;