Skip to content
Commit 303c146d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'timers/urgent' into timers/core 



Pick up urgent bug fix and resolve the conflict.

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