diff --git a/[refs] b/[refs]
index 3af25257d44f..e1f6a480f8ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 177ffe506cf8ab5d1d52e7af36871a70d8c22e90
+refs/heads/master: 3a35c00b048ec368978cb497415c7a02f9200415
diff --git a/trunk/Documentation/DocBook/media/v4l/gen-errors.xml b/trunk/Documentation/DocBook/media/v4l/gen-errors.xml
index 5bbf3ce1973a..737ecaaa335d 100644
--- a/trunk/Documentation/DocBook/media/v4l/gen-errors.xml
+++ b/trunk/Documentation/DocBook/media/v4l/gen-errors.xml
@@ -6,6 +6,13 @@
     &cs-str;
     <tbody valign="top">
 	<!-- Keep it ordered alphabetically -->
+      <row>
+	<entry>EAGAIN</entry>
+	<entry>The ioctl can't be handled because the device is in state where
+	       it can't perform it. This could happen for example in case where
+	       device is sleeping and ioctl is performed to query statistics.
+	</entry>
+      </row>
       <row>
 	<entry>EBADF</entry>
 	<entry>The file descriptor is not a valid.</entry>
@@ -50,11 +57,6 @@
 	       that this request would overcommit the usb bandwidth reserved
 	       for periodic transfers (up to 80% of the USB bandwidth).</entry>
       </row>
-      <row>
-	<entry>ENOSYS or EOPNOTSUPP</entry>
-	<entry>Function not available for this device (dvb API only. Will likely
-	       be replaced anytime soon by ENOTTY).</entry>
-      </row>
       <row>
 	<entry>EPERM</entry>
 	<entry>Permission denied. Can be returned if the device needs write