]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9036a1198723ee1930eb4fe51d934656857edbbd
tree43ebd9894ff53a7b2d0244293f226cbbfc80d882
parentd08f2cb9b0391caaa51774e38dc02b7d0be7179c
parentc10a71c2fa195a8e12241d2d1465d23436630e1d
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