Merge commit 'v2.6.28-rc1' into sched/urgent

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched_fair.c
Simple merge

diff --cc kernel/sched_rt.c
Simple merge