diff --git a/[refs] b/[refs]
index 4ff1a2523a90..1d684b911a7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36d47481b3824b661b464077db95d447984df799
+refs/heads/master: 90cba64a5f672a239f43ec5cb9a11b806887331e
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index 33fc9d175f40..8e92be654dad 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -1023,8 +1023,8 @@ static inline void __run_timers(struct tvec_base *base)
 #ifdef CONFIG_NO_HZ
 /*
  * Find out when the next timer event is due to happen. This
- * is used on S/390 to stop all activity when a cpus is idle.
- * This functions needs to be called disabled.
+ * is used on S/390 to stop all activity when a CPU is idle.
+ * This function needs to be called with interrupts disabled.
  */
 static unsigned long __next_timer_interrupt(struct tvec_base *base)
 {