]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'sched/urgent'; commit 'v2.6.29-rc5' into sched/core
authorIngo Molnar <mingo@elte.hu>
Sun, 15 Feb 2009 20:15:16 +0000 (21:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 15 Feb 2009 20:15:16 +0000 (21:15 +0100)
1  2  3 
include/linux/init_task.h
include/linux/sched.h
kernel/sched.c
kernel/sched_fair.c

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