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

Merge branch 'linus' into sched/core 



Reason: Bring bakc upstream modification to resolve conflicts

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