From 0e4a02d4646250a234857824c677dadc5df39357 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 16 Sep 2009 23:56:44 -0300
Subject: [PATCH] --- yaml --- r: 164130 b: refs/heads/master c:
 4e5fee2bc15bf1226783db5855c25ec8ebfb25ac h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/Documentation/DocBook/v4l/pixfmt.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0bcfabae3ec4..94723b9aaaaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 453d63c6a1afff9aa7e83ac9c3a9dbd6254a1fcd
+refs/heads/master: 4e5fee2bc15bf1226783db5855c25ec8ebfb25ac
diff --git a/trunk/Documentation/DocBook/v4l/pixfmt.xml b/trunk/Documentation/DocBook/v4l/pixfmt.xml
index ebfbed03dbb2..7d396a3785f5 100644
--- a/trunk/Documentation/DocBook/v4l/pixfmt.xml
+++ b/trunk/Documentation/DocBook/v4l/pixfmt.xml
@@ -777,6 +777,11 @@ kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.hm
 url="http://www.thedirks.org/winnov/">
 http://www.thedirks.org/winnov/</ulink></para></entry>
 	  </row>
+	  <row id="V4L2-PIX-FMT-TM6000">
+	    <entry><constant>V4L2_PIX_FMT_TM6000</constant></entry>
+	    <entry>'TM60'</entry>
+	    <entry><para>Used by Trident tm6000</para></entry>
+	  </row>
 	  <row id="V4L2-PIX-FMT-YYUV">
 	    <entry><constant>V4L2_PIX_FMT_YYUV</constant></entry>
 	    <entry>'YYUV'</entry>