Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 May 2008 18:31:07 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 May 2008 18:31:07 +0000 (11:31 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
  sched: fix weight calculations
  semaphore: fix


Trivial merge