tree ebd97fe13e070bff1f5b24d3de8b26ad3b7cf056
parent 902f2ac9da7975a5a04fc835860f2a7096c481d3
parent ec5d498991e87c74730509508b25c3959192b7e7
author Linus Torvalds <torvalds@linux-foundation.org> 1221866232 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221866232 -0700

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: fix deadlock in setting scheduler parameter to zero
  sched: fix 2.6.27-rc5 couldn't boot on tulsa machine randomly