Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Tue, 11 Mar 2014 10:34:27 +0000 (11:34 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 11 Mar 2014 10:34:27 +0000 (11:34 +0100)
commita02ed5e3e05ec5e8af21e645cccc77f3a6480aaf
tree95a0df31b0c9b1e0357b8dd378e2eab637970df4
parent2b3942e4bb20ef8ef26515bd958c2df83d9a6210
parent96b3d28bf4b00f62fc8386ff5d487d1830793a3d
Merge branch 'sched/urgent' into sched/core

Pick up fixes before queueing up new changes.

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