From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 May 2008 18:31:07 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux... 
X-Git-Tag: v2.6.26-rc2~26
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4f51b4662074c6ee26c972126a317c05f65be06;p=linux-2.6

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
  sched: fix weight calculations
  semaphore: fix
---

c4f51b4662074c6ee26c972126a317c05f65be06