]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Fri, 20 Sep 2013 10:00:42 +0000 (12:00 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 20 Sep 2013 10:01:01 +0000 (12:01 +0200)
Merge in the latest fixes before applying a dependent patch.

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

Simple merge