diff --git a/[refs] b/[refs]
index d89d9d0e1336..4d4be2c24169 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfcf4f9d97eec997283e41cef2d2b6956c32fecd
+refs/heads/master: 9e1d50756bad35c7e1b566bed9426f68d93135fd
diff --git a/trunk/Documentation/DocBook/media/v4l/media-ioc-setup-link.xml b/trunk/Documentation/DocBook/media/v4l/media-ioc-setup-link.xml
index cec97af4dab4..fc2e522ee65a 100644
--- a/trunk/Documentation/DocBook/media/v4l/media-ioc-setup-link.xml
+++ b/trunk/Documentation/DocBook/media/v4l/media-ioc-setup-link.xml
@@ -71,15 +71,6 @@
     &return-value;
 
     <variablelist>
-      <varlistentry>
-	<term><errorcode>EBUSY</errorcode></term>
-	<listitem>
-	  <para>The link properties can't be changed because the link is
-	  currently busy. This can be caused, for instance, by an active media
-	  stream (audio or video) on the link. The ioctl shouldn't be retried if
-	  no other action is performed before to fix the problem.</para>
-	</listitem>
-      </varlistentry>
       <varlistentry>
 	<term><errorcode>EINVAL</errorcode></term>
 	<listitem>