diff --git a/[refs] b/[refs]
index 564a4898d96b..7bc29a446718 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 669d7868ae414cdb7b7e5df375dc8e4b47f26f6d
+refs/heads/master: 3055addadbe9bfb2365006a1c13fd342a8d30d52
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index 49cbf7cffebd..f181ff4dd32e 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -606,6 +606,9 @@ static inline void run_hrtimer_queue(struct hrtimer_base *base)
 {
 	struct rb_node *node;
 
+	if (!base->first)
+		return;
+
 	if (base->get_softirq_time)
 		base->softirq_time = base->get_softirq_time();