Skip to content
Snippets Groups Projects
Commit a787bdaf authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core, to resolve semantic conflict 


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2914b0ba 85a2c56c
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 218 additions and 124 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment