tree 13489998c59c5d7ac6d46b7835c7f4a6ccfab2e6
parent 3024e4a99744f5b59704a6570524a312f94f010f
parent 54e991242850edc8c53f71fa5aa3ba7a93ce38f5
author Linus Torvalds <torvalds@linux-foundation.org> 1236119600 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1236119600 -0800

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: don't allow setuid to succeed if the user does not have rt bandwidth
  sched_rt: don't start timer when rt bandwidth disabled