2 files changed, 22 insertions, 0 deletions

diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index 97b895151bb0..4559a6f8a5f0 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2471,6 +2471,15 @@ that used it. It was originally scheduled for removal in 2.6.35.
       </orderedlist>
     </section>
 
+    <section>
+      <title>V4L2 in Linux 3.6</title>
+      <orderedlist>
+        <listitem>
+          <para>Added V4L2_CAP_VIDEO_M2M and V4L2_CAP_VIDEO_M2M_MPLANE capabilities.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
     <section id="other">
       <title>Relation of V4L2 to other Linux multimedia APIs</title>
 
diff --git a/Documentation/DocBook/media/v4l/vidioc-querycap.xml b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
index 4643505cd4ca..f33dd746b66b 100644
--- a/Documentation/DocBook/media/v4l/vidioc-querycap.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
@@ -192,6 +192,19 @@ linkend="output">Video Output</link> interface.</entry>
             <link linkend="output">Video Output</link> interface.</entry>
           </row>
           <row>
+            <entry><constant>V4L2_CAP_VIDEO_M2M</constant></entry>
+            <entry>0x00004000</entry>
+            <entry>The device supports the single-planar API through the
+            Video Memory-To-Memory interface.</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_CAP_VIDEO_M2M_MPLANE</constant></entry>
+            <entry>0x00008000</entry>
+            <entry>The device supports the
+            <link linkend="planar-apis">multi-planar API</link> through the
+            Video Memory-To-Memory  interface.</entry>
+          </row>
+          <row>
             <entry><constant>V4L2_CAP_VIDEO_OVERLAY</constant></entry>
             <entry>0x00000004</entry>
             <entry>The device supports the <link