diff --git a/[refs] b/[refs]
index bc9c70e67b58..634b58098000 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 058806007450489bb8f457b275e5cb5c946320c1
+refs/heads/master: c4ff1b5f8bf09d77d7329cbff224f0237646c90e
diff --git a/trunk/Documentation/CodingStyle b/trunk/Documentation/CodingStyle
index cb9258b8fd35..495e5ba1634c 100644
--- a/trunk/Documentation/CodingStyle
+++ b/trunk/Documentation/CodingStyle
@@ -454,6 +454,16 @@ The preferred style for long (multi-line) comments is:
 	 * with beginning and ending almost-blank lines.
 	 */
 
+For files in net/ and drivers/net/ the preferred style for long (multi-line)
+comments is a little different.
+
+	/* The preferred comment style for files in net/ and drivers/net
+	 * looks like this.
+	 *
+	 * It is nearly the same as the generally preferred comment style,
+	 * but there is no initial almost-blank line.
+	 */
+
 It's also important to comment data, whether they are basic types or derived
 types.  To this end, use just one data declaration per line (no commas for
 multiple data declarations).  This leaves you room for a small comment on each