diff --git a/[refs] b/[refs]
index 7432d5a38fd0..3eed6aaab371 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 040e5bf65e1ee66266bc314c5965518a7c21ff36
+refs/heads/master: 6237dd132d4eb408ffa80830fe395448e5657ab0
diff --git a/trunk/Documentation/power/suspend-and-cpuhotplug.txt b/trunk/Documentation/power/suspend-and-cpuhotplug.txt
index f28f9a6f0347..e13dafc8e8f1 100644
--- a/trunk/Documentation/power/suspend-and-cpuhotplug.txt
+++ b/trunk/Documentation/power/suspend-and-cpuhotplug.txt
@@ -29,7 +29,7 @@ More details follow:
 
                                   Write 'mem' to
                                 /sys/power/state
-                                    syfs file
+                                    sysfs file
                                         |
                                         v
                                Acquire pm_mutex lock