diff --git a/[refs] b/[refs]
index dc0063c19e02..861fcf10384b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ca9d7856c101f4b1d2c7d3f2ad2fcce8e9a20ae
+refs/heads/master: 1816315b10862277a961a70ec394b6607983041d
diff --git a/trunk/include/linux/stop_machine.h b/trunk/include/linux/stop_machine.h
index 092dc9b1ce7d..2d3f0b1b054c 100644
--- a/trunk/include/linux/stop_machine.h
+++ b/trunk/include/linux/stop_machine.h
@@ -94,7 +94,7 @@ static inline int try_stop_cpus(const struct cpumask *cpumask,
  * stop_machine "Bogolock": stop the entire machine, disable
  * interrupts.  This is a very heavy lock, which is equivalent to
  * grabbing every spinlock (and more).  So the "read" side to such a
- * lock is anything which disables preeempt.
+ * lock is anything which disables preemption.
  */
 #if defined(CONFIG_STOP_MACHINE) && defined(CONFIG_SMP)