diff --git a/[refs] b/[refs]
index 5008592af29b..674b07823d5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa781aeb49752e5654241b53368c80362ad7bea3
+refs/heads/master: 4b8a8b812edd7067fffcc4a85b8aa3adae081535
diff --git a/trunk/Documentation/console/console.txt b/trunk/Documentation/console/console.txt
index d3e17447321c..877a1b26cc3d 100644
--- a/trunk/Documentation/console/console.txt
+++ b/trunk/Documentation/console/console.txt
@@ -29,7 +29,7 @@ In newer kernels, the following are also available:
 
 If sysfs is enabled, the contents of /sys/class/vtconsole can be
 examined. This shows the console backends currently registered by the
-system which are named vtcon<n> where <n> is an integer fro 0 to 15. Thus:
+system which are named vtcon<n> where <n> is an integer from 0 to 15. Thus:
 
        ls /sys/class/vtconsole
        .  ..  vtcon0  vtcon1