diff --git a/[refs] b/[refs]
index 9f4b1420737a..a808b436f1f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb994ecc2b1c214951366c2ba5d8b121f0010d1f
+refs/heads/master: 64ffc9ff424c65adcffe7d590018cc75e2d5d42a
diff --git a/trunk/Documentation/kbuild/makefiles.txt b/trunk/Documentation/kbuild/makefiles.txt
index 01351554df60..71c602d61680 100644
--- a/trunk/Documentation/kbuild/makefiles.txt
+++ b/trunk/Documentation/kbuild/makefiles.txt
@@ -320,7 +320,7 @@ more details, with real examples.
     subdir-ccflags-y, subdir-asflags-y
 	The two flags listed above are similar to ccflags-y and as-falgs-y.
 	The difference is that the subdir- variants has effect for the kbuild
-	file where they are present and all subdirectories.
+	file where tey are present and all subdirectories.
 	Options specified using subdir-* are added to the commandline before
 	the options specified using the non-subdir variants.