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

Merge branch 'WIP.sched/core' into sched/core



 Conflicts:
	kernel/sched/Makefile

Pick up the waitqueue related renames - it didn't get much feedback,
so it appears to be uncontroversial. Famous last words? ;-)

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