Skip to content
Commit 6402c7dc authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'linus' into timers/core 


Reason: Get upstream fixes before adding conflicting code.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 77c675ba 60d509fa
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment