diff --git a/[refs] b/[refs]
index 0412b430b9ce..d9a4df6116f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72c3368856c543ace033f6a5b9a3edf1f4043236
+refs/heads/master: cfd8d6c0ed89ba387609419e3d8d4c6b92a5d446
diff --git a/trunk/include/linux/smp.h b/trunk/include/linux/smp.h
index 7a0570e6a596..cfa2d20e35f1 100644
--- a/trunk/include/linux/smp.h
+++ b/trunk/include/linux/smp.h
@@ -154,7 +154,7 @@ smp_call_function_any(const struct cpumask *mask, void (*func)(void *info),
 /*
  * smp_processor_id(): get the current CPU ID.
  *
- * if DEBUG_PREEMPT is enabled the we check whether it is
+ * if DEBUG_PREEMPT is enabled then we check whether it is
  * used in a preemption-safe way. (smp_processor_id() is safe
  * if it's used in a preemption-off critical section, or in
  * a thread that is bound to the current CPU.)