diff --git a/[refs] b/[refs]
index b31fe21a4abb..5c42b37a5f68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3271f656458063e9bb0da9ba920771ecc6f024c
+refs/heads/master: b40b5162ac4e5b94d16cd9fb0a87168b1633c7dd
diff --git a/trunk/Documentation/hrtimers/highres.txt b/trunk/Documentation/hrtimers/highres.txt
index ce0e9a91e157..a73ecf5b4bdb 100644
--- a/trunk/Documentation/hrtimers/highres.txt
+++ b/trunk/Documentation/hrtimers/highres.txt
@@ -98,7 +98,7 @@ System-level global event devices are used for the Linux periodic tick. Per-CPU
 event devices are used to provide local CPU functionality such as process
 accounting, profiling, and high resolution timers.
 
-The management layer assignes one or more of the folliwing functions to a clock
+The management layer assigns one or more of the following functions to a clock
 event device:
       - system global periodic tick (jiffies update)
       - cpu local update_process_times