]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@elte.hu>
Fri, 28 Nov 2008 19:11:05 +0000 (20:11 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 28 Nov 2008 19:11:05 +0000 (20:11 +0100)
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge