tree 56e1d7715653871f015341c7edabd08045f5fc28
parent 1f3a8e093f470ef193b0ca6011d90180331c8b53
parent c8b281161dfa4bb5d5be63fb036ce19347b88c63
author Linus Torvalds <torvalds@linux-foundation.org> 1306180428 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306180428 -0700

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()