]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 19:53:48 +0000 (12:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 19:53:48 +0000 (12:53 -0700)
commit15a3d11b0f2ebdfb3591e411e268aa81998d4723
tree56e1d7715653871f015341c7edabd08045f5fc28
parent1f3a8e093f470ef193b0ca6011d90180331c8b53
parentc8b281161dfa4bb5d5be63fb036ce19347b88c63
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()
include/linux/sched.h
kernel/sched.c