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

Merge branch 'sched' into sched-devel 



Conflicts:

	kernel/sched_rt.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 20b6331b 15a8641e
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