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

Merge branch 'smp/hotplug' into sched/core, to resolve conflicts 



Conflicts:
	kernel/sched/core.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents eb60b3e5 e5ef27d0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment