diff --git a/[refs] b/[refs]
index 80924435becc..b663aca65bc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64ce4c2f5252f25798117fa80a027993163d6d84
+refs/heads/master: 06f71b922ce5a05352acd706564ca4ae1f2add0e
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index c61a7949387f..f82f4bfe2d88 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -1027,11 +1027,8 @@ static inline void __run_timers(struct tvec_base *base)
 				lock_map_release(&lockdep_map);
 
 				if (preempt_count != preempt_count()) {
-					printk(KERN_ERR "huh, entered %p "
-					       "with preempt_count %08x, exited"
-					       " with %08x?\n",
-					       fn, preempt_count,
-					       preempt_count());
+					printk(KERN_ERR "timer: %pF preempt leak: %08x -> %08x\n",
+					       fn, preempt_count, preempt_count());
 					BUG();
 				}
 			}