From f1d8f778daf5a50ca00b081d9c225c0284cc7036 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 7 Jan 2013 16:30:24 -0300
Subject: [PATCH] --- yaml --- r: 357469 b: refs/heads/master c:
 22331a5e0a493f8edfbd504bb58bd03d308ddb0c h: refs/heads/master i:   357467:
 d1a64165a4245c86cc2b43f19bf09f4bc62f3643 v: v3

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

diff --git a/[refs] b/[refs]
index 7241136eee16..3e6eeaac35c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a46edeb0f6098088f316c3543474784f8108508e
+refs/heads/master: 22331a5e0a493f8edfbd504bb58bd03d308ddb0c
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-querycap.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-querycap.xml
index 4c70215ae03f..d5a3c97b206a 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-querycap.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-querycap.xml
@@ -76,7 +76,7 @@ make sure the strings are properly NUL-terminated.</para></entry>
 	  <row>
 	    <entry>__u8</entry>
 	    <entry><structfield>card</structfield>[32]</entry>
-	    <entry>Name of the device, a NUL-terminated ASCII string.
+	    <entry>Name of the device, a NUL-terminated UTF-8 string.
 For example: "Yoyodyne TV/FM". One driver may support different brands
 or models of video hardware. This information is intended for users,
 for example in a menu of available devices. Since multiple TV cards of