From: Linus Torvalds Date: Fri, 7 Mar 2008 18:08:17 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux... X-Git-Tag: v2.6.25-rc5~13 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1d6789c3bc2b70bed1eb71aa616b1d94f9c23a63;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel: sched: don't allow rt_runtime_us to be zero for groups having rt tasks sched: rt-group: fixup schedulability constraints calculation sched: fix the wrong time slice value for SCHED_FIFO tasks sched: export task_nice sched: balance RT task resched only on runqueue sched: retain vruntime --- 1d6789c3bc2b70bed1eb71aa616b1d94f9c23a63