Skip to content
Commit 268a3dcf authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2 



Conflicts:

	kernel/time/tick-sched.c

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents c4bd822e 592aa999
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