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

Merge branch 'linus' into x86/urgent 



Merge in Linus's tree to avoid a conflict.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d6250a3f e2b34e31
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