Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Fri, 30 Jan 2015 18:28:36 +0000 (19:28 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 30 Jan 2015 18:28:36 +0000 (19:28 +0100)
commit3847b272248a3a4ed70d20392cc0454917f7713b
tree2df5f60ebf35b128bbe7509a878829236c6cfcab
parent5a5375977b721503e4d6b37ab8982902cd2d10b3
parentbb2bc55a694d45cdeda91b6f28ab2adec28125ef
Merge branch 'sched/urgent' into sched/core

Merge all pending fixes and refresh the tree, before applying new changes.

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