Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:17:12 +0000 (16:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:17:12 +0000 (16:17 -0700)
commitb4df9d88a62c6db4cee0d96507a27527bf205dde
treeebd97fe13e070bff1f5b24d3de8b26ad3b7cf056
parent902f2ac9da7975a5a04fc835860f2a7096c481d3
parentec5d498991e87c74730509508b25c3959192b7e7
Merge branch 'sched-fixes-for-linus' of git://git./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: fix deadlock in setting scheduler parameter to zero
  sched: fix 2.6.27-rc5 couldn't boot on tulsa machine randomly