Merge branch 'smp/hotplug' into sched/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Thu, 12 May 2016 07:51:36 +0000 (09:51 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 12 May 2016 07:51:36 +0000 (09:51 +0200)
commit4eb867651721228ee2eeae142c53378375303e8b
tree43ebd9894ff53a7b2d0244293f226cbbfc80d882
parenteb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6
parente5ef27d0f5acf9f1db2882d7546a41c021f66820
Merge branch 'smp/hotplug' into sched/core, to resolve conflicts

Conflicts:
kernel/sched/core.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/sched.h
kernel/sched/core.c
kernel/sched/fair.c
kernel/sched/sched.h