Merge branch 'jc/apply-fix-mismerge' into maint

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index a4191aa3889000ed844678331e5fd7f9fc628ba4..2248cf7324c712960db87cd96a4bb030d062cb81 100644 (file)
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -24,7 +24,7 @@ code.  For Git in general, a few rough rules are:
 
    "Once it _is_ in the tree, it's not really worth the patch noise to
    go and fix it up."
-   Cf. http://article.gmane.org/gmane.linux.kernel/943020
+   Cf. http://lkml.iu.edu/hypermail/linux/kernel/1001.3/01069.html
 
 Make your code readable and sensible, and don't try to be clever.