summaryrefslogtreecommitdiff
path: root/Documentation/DocBook/media/v4l/compat.xml
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-11-20 23:46:04 +0300
committerTakashi Iwai <tiwai@suse.de>2014-11-20 23:46:04 +0300
commita69862d8d04e4877965cc938140c9f8e6da0b827 (patch)
tree667cace5c2fad872871e4d24d0c895664f0e0bc6 /Documentation/DocBook/media/v4l/compat.xml
parent0f32fd1900e6b972f289416dbd75e92772b630cb (diff)
parent01cb156edbbd4e6c4fd8db0d05f18c62c424f9aa (diff)
downloadlinux-a69862d8d04e4877965cc938140c9f8e6da0b827.tar.xz
Merge branch 'for-linus' into test/usb-resume
Diffstat (limited to 'Documentation/DocBook/media/v4l/compat.xml')
-rw-r--r--Documentation/DocBook/media/v4l/compat.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index 07ffc76553ba..0a2debfa68f6 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2566,6 +2566,10 @@ fields changed from _s32 to _u32.
<para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.
</para>
</listitem>
+ </orderedlist>
+ </section>
+
+ <section>
<title>V4L2 in Linux 3.18</title>
<orderedlist>
<listitem>