diff --git a/[refs] b/[refs]
index 42d17607a245..b1fb5d64b776 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0acbc6c651911dc9ffb4f59b34306bc1ccb751e5
+refs/heads/master: 70221395ba980392ba98c1d78f6c9f77be03df9e
diff --git a/trunk/Documentation/CodingStyle b/trunk/Documentation/CodingStyle
index 7b5762eded2c..72968cd5eaf3 100644
--- a/trunk/Documentation/CodingStyle
+++ b/trunk/Documentation/CodingStyle
@@ -498,7 +498,8 @@ values.  To do the latter, you can stick the following in your .emacs file:
             (let ((filename (buffer-file-name)))
               ;; Enable kernel mode for the appropriate files
               (when (and filename
-                         (string-match "~/src/linux-trees" filename))
+                         (string-match (expand-file-name "~/src/linux-trees")
+                                       filename))
                 (setq indent-tabs-mode t)
                 (c-set-style "linux-tabs-only")))))