diff --git a/[refs] b/[refs] index 984161877858..aca7012003f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc47e7b592dc45b03c27b0a4c8f2d215dae9944d +refs/heads/master: 6dba28379edc08327ede01ff41bd3c9dd46a7fa0 diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h index e4bccbcc2750..4fc379de6c2f 100644 --- a/trunk/include/linux/hrtimer.h +++ b/trunk/include/linux/hrtimer.h @@ -80,6 +80,7 @@ struct hrtimer_sleeper { * @get_softirq_time: function to retrieve the current time from the softirq * @curr_timer: the timer which is executing a callback right now * @softirq_time: the time when running the hrtimer queue in the softirq + * @lock_key: the lock_class_key for use with lockdep */ struct hrtimer_base { clockid_t index;