diff --git a/[refs] b/[refs]
index b3bf22938171..e8adf9d53e7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 507215f8d04f9e61f38c975e61d93bcafd30815f
+refs/heads/master: 274a517ec13b3b47047b97a2e7c912138c9806e0
diff --git a/trunk/Documentation/networking/phonet.txt b/trunk/Documentation/networking/phonet.txt
index 6e8ce09f9c73..cf76608a2d35 100644
--- a/trunk/Documentation/networking/phonet.txt
+++ b/trunk/Documentation/networking/phonet.txt
@@ -112,6 +112,22 @@ However, connect() and getpeername() are not supported, as they did
 not seem useful with Phonet usages (could be added easily).
 
 
+Resource subscription
+---------------------
+
+A Phonet datagram socket can be subscribed to any number of 8-bits
+Phonet resources, as follow:
+
+  uint32_t res = 0xXX;
+  ioctl(fd, SIOCPNADDRESOURCE, &res);
+
+Subscription is similarly cancelled using the SIOCPNDELRESOURCE I/O
+control request, or when the socket is closed.
+
+Note that no more than one socket can be subcribed to any given
+resource at a time. If not, ioctl() will return EBUSY.
+
+
 Phonet Pipe protocol
 --------------------