diff --git a/[refs] b/[refs]
index 78220355dc0f..ef88aa3923f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d8133919bac4270883b24328500875a49e71b36
+refs/heads/master: 048a0e8f5e1d94c01a5fc70f5b2f2fd2f4527326
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index a297ffcf888e..837c552fe838 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -861,7 +861,13 @@ EXPORT_SYMBOL(mod_timer);
  *
  * mod_timer_pinned() is a way to update the expire field of an
  * active timer (if the timer is inactive it will be activated)
- * and not allow the timer to be migrated to a different CPU.
+ * and to ensure that the timer is scheduled on the current CPU.
+ *
+ * Note that this does not prevent the timer from being migrated
+ * when the current CPU goes offline.  If this is a problem for
+ * you, use CPU-hotplug notifiers to handle it correctly, for
+ * example, cancelling the timer when the corresponding CPU goes
+ * offline.
  *
  * mod_timer_pinned(timer, expires) is equivalent to:
  *