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

Merge branch 'linus' into core/softlockup 



Conflicts:

	kernel/softlockup.c

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