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

Merge branch 'linus' into sched/devel 



Conflicts:

	kernel/sched_rt.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 1de8644c 543cf4cb
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