Skip to content
Commit 3687a2c0 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'linus' into timers/core 



Reason: Pick up the hrtimer_clock_to_base_table fix from mainline

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents b4d246b1 c7bcecbe
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment