From 42fb108947f1e006d992498e769e3d9cabbfc537 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Wed, 9 Nov 2011 10:53:01 -0300
Subject: [PATCH] --- yaml --- r: 285319 b: refs/heads/master c:
 b698c784bfacc909b05e043d8fca08281fe154bb h: refs/heads/master i:   285317:
 141d5e1e19b0d3033ef05c6e9df37aad97ab75b4   285315:
 27e647517b825d925fe7ce08a4a2d76afbe6d424   285311:
 938aa4a383c9b500f46fb4c9a11d885b9daee87d v: v3

---
 [refs]                                                  | 2 +-
 trunk/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 26cfd252ef04..8bdbd55031f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43599f31ab93bc2c17db615be20ce56261392292
+refs/heads/master: b698c784bfacc909b05e043d8fca08281fe154bb
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml
index 109d7294d355..93817f337033 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml
@@ -340,8 +340,8 @@ blending makes no sense for destructive overlays.</entry>
 	  <row>
 	    <entry><constant>V4L2_FBUF_CAP_SRC_CHROMAKEY</constant></entry>
 	    <entry>0x0080</entry>
-	    <entry>The device supports Source Chroma-keying. Framebuffer pixels
-with the chroma-key colors are replaced by video pixels, which is exactly opposite of
+	    <entry>The device supports Source Chroma-keying. Video pixels
+with the chroma-key colors are replaced by framebuffer pixels, which is exactly opposite of
 <constant>V4L2_FBUF_CAP_CHROMAKEY</constant></entry>
 	  </row>
 	</tbody>