diff --git a/[refs] b/[refs]
index 91b457545665..b3965a99c46d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ca7d93bb27876e5fd4ebfcb3b00627107bdad4d
+refs/heads/master: 15d2bace5ec907530a3d0e0cf4bb1bd29f3ad7b7
diff --git a/trunk/include/linux/timer.h b/trunk/include/linux/timer.h
index b1dc583bb4d4..72f3a7781106 100644
--- a/trunk/include/linux/timer.h
+++ b/trunk/include/linux/timer.h
@@ -78,8 +78,9 @@ extern unsigned long next_timer_interrupt(void);
  * Timers with an ->expired field in the past will be executed in the next
  * timer tick.
  */
-static inline void add_timer(struct timer_list * timer)
+static inline void add_timer(struct timer_list *timer)
 {
+	BUG_ON(timer_pending(timer));
 	__mod_timer(timer, timer->expires);
 }