Merge branch 'sched/core' into timers/nohz, to avoid conflicts in upcoming patches
authorIngo Molnar <mingo@kernel.org>
Thu, 14 Jul 2016 08:37:48 +0000 (10:37 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 14 Jul 2016 08:37:48 +0000 (10:37 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge