Merge branch 'sched/latest' of git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins...
Ingo Molnar [Sun, 11 Jan 2009 03:58:49 +0000 (04:58 +0100)]
1  2 
include/linux/init_task.h
include/linux/sched.h
kernel/sched.c
kernel/sched_rt.c

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