diff --git a/[refs] b/[refs]
index d05f3d780f7f..d631ae68c1ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b47300168e770b60ab96c8924854c3b0eb4260eb
+refs/heads/master: 9d6ada9f4141fb8ab3c5d7dffe382f6a68b8e961
diff --git a/trunk/Documentation/networking/phy.txt b/trunk/Documentation/networking/phy.txt
index 8df6a7b0e66c..88bb71b46da4 100644
--- a/trunk/Documentation/networking/phy.txt
+++ b/trunk/Documentation/networking/phy.txt
@@ -96,7 +96,7 @@ Letting the PHY Abstraction Layer do Everything
    static void adjust_link(struct net_device *dev);
  
  Next, you need to know the device name of the PHY connected to this device. 
- The name will look something like, "phy0:0", where the first number is the
+ The name will look something like, "0:00", where the first number is the
  bus id, and the second is the PHY's address on that bus.  Typically,
  the bus is responsible for making its ID unique.