diff --git a/[refs] b/[refs]
index 20296f0dc049..7aa20df7fe3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b18e7a0be859911b22138ce27258687efc528b8
+refs/heads/master: fe4abb550f68ace5bbc23030c968c138c6a69759
diff --git a/trunk/Documentation/DocBook/media/v4l/io.xml b/trunk/Documentation/DocBook/media/v4l/io.xml
index 09e8dcf5e9c4..2c4646d504c2 100644
--- a/trunk/Documentation/DocBook/media/v4l/io.xml
+++ b/trunk/Documentation/DocBook/media/v4l/io.xml
@@ -905,7 +905,7 @@ should set this to 0.</entry>
 	  </row>
 	  <row>
 	    <entry></entry>
-	    <entry>__unsigned long</entry>
+	    <entry>unsigned long</entry>
 	    <entry><structfield>userptr</structfield></entry>
 	    <entry>When the memory type in the containing &v4l2-buffer; is
 	      <constant>V4L2_MEMORY_USERPTR</constant>, this is a userspace