]> Pileus Git - ~andy/linux/commitdiff
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)
Pick up the latest fixes before applying new changes.

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

diff --cc kernel/fork.c
Simple merge
Simple merge