| commit | 15a3d11b0f2ebdfb3591e411e268aa81998d4723 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 23 12:53:48 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 23 12:53:48 2011 -0700 |
| tree | 56e1d7715653871f015341c7edabd08045f5fc28 | |
| parent | 1f3a8e093f470ef193b0ca6011d90180331c8b53 [diff] | |
| parent | c8b281161dfa4bb5d5be63fb036ce19347b88c63 [diff] |
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Increase SCHED_LOAD_SCALE resolution sched: Introduce SCHED_POWER_SCALE to scale cpu_power calculations sched: Cleanup set_load_weight()