Skip to content
Commit 7fd52392 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/urgent 



Merge reason: we need to fix a non-trivial merge conflict.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents b01c3a00 e22057c8
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