diff --git a/[refs] b/[refs]
index d697e4d14e44..4c1b79333d45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
---
-refs/heads/master: c082266f60b749fa55074ee4c8b2ea99e4b59320
+refs/heads/master: 16d18b16ace670641de74e6fe8005029b4057559
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
index 6673ce582050..cd7720d404ea 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
@@ -54,15 +54,9 @@
interface and may change in the future.
- To query the available timings, applications initialize the
-index field and zero the reserved array of &v4l2-dv-timings-cap;
-and call the VIDIOC_DV_TIMINGS_CAP ioctl with a pointer to this
-structure. Drivers fill the rest of the structure or return an
-&EINVAL; when the index is out of bounds. To enumerate all supported DV timings,
-applications shall begin at index zero, incrementing by one until the
-driver returns EINVAL. Note that drivers may enumerate a
-different set of DV timings after switching the video input or
-output.
+ To query the capabilities of the DV receiver/transmitter applications can call
+this ioctl and the driver will fill in the structure. Note that drivers may return
+different values after switching the video input or output.
struct v4l2_bt_timings_cap
@@ -115,7 +109,7 @@ output.
__u32
reserved[16]
-
+ Reserved for future extensions. Drivers must set the array to zero.