diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /Documentation/DocBook/media/v4l/pixfmt-yvyu.xml | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'Documentation/DocBook/media/v4l/pixfmt-yvyu.xml')
| -rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-yvyu.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml b/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml index 40d17ae39dde..bfffdc76d3da 100644 --- a/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml +++ b/Documentation/DocBook/media/v4l/pixfmt-yvyu.xml | |||
| @@ -118,11 +118,3 @@ pixel image</title> | |||
| 118 | </example> | 118 | </example> |
| 119 | </refsect1> | 119 | </refsect1> |
| 120 | </refentry> | 120 | </refentry> |
| 121 | |||
| 122 | <!-- | ||
| 123 | Local Variables: | ||
| 124 | mode: sgml | ||
| 125 | sgml-parent-document: "pixfmt.sgml" | ||
| 126 | indent-tabs-mode: nil | ||
| 127 | End: | ||
| 128 | --> | ||