]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
authorIngo Molnar <mingo@elte.hu>
Fri, 3 Jun 2011 08:27:47 +0000 (10:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 3 Jun 2011 08:27:47 +0000 (10:27 +0200)
1  2 
kernel/sched.c
kernel/sched_rt.c

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