Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Tue, 17 Dec 2013 14:22:35 +0000 (15:22 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 17 Dec 2013 14:22:35 +0000 (15:22 +0100)
commitffe732c2430c55074bebb172d33d909c662cd0e3
treed39087d7b5d8caa505b23b6ea2abc2e33efa5be5
parent40ea2b42d7c44386cf81d5636d574193da2c8df2
parent757dfcaa41844595964f1220f1d33182dae49976
Merge branch 'sched/urgent' into sched/core

Merge the latest batch of fixes before applying development patches.

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