Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Mon, 13 Jan 2014 12:35:28 +0000 (13:35 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 13 Jan 2014 12:35:28 +0000 (13:35 +0100)
commit56b4811039174bba9cbd68318d0d8b1585b9eded
treef3e8f99e85e545662d82e18bef2a7009c2948852
parente777b63bbd589248eb151a3191ee92331a701385
parent9722c2dac708e9468cc0dc30218ef76946ffbc9d
Merge branch 'sched/urgent' into sched/core

Pick up the latest fixes before applying new changes.

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