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)
commitc4f51b4662074c6ee26c972126a317c05f65be06
treeea6b25a3b45d11d649f85626a9879ce7723554da
parentf589274533eb94e0217acc1db6240ce6e621bb56
parent46151122e0a2e80e5a6b2889f595e371fe2b600d
Merge branch 'for-linus' of git://git./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