| commit | c4f51b4662074c6ee26c972126a317c05f65be06 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 08 11:31:07 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 08 11:31:07 2008 -0700 |
| tree | ea6b25a3b45d11d649f85626a9879ce7723554da | |
| parent | f589274533eb94e0217acc1db6240ce6e621bb56 [diff] | |
| parent | 46151122e0a2e80e5a6b2889f595e371fe2b600d [diff] |
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