From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 May 2011 19:53:48 +0000 (-0700)
Subject: Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12-rc1~6054
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15a3d11b0f2ebdfb3591e411e268aa81998d4723;p=kernel%2Fkernel-generic.git

Merge branch 'sched-core-for-linus' of git://git./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()
---

15a3d11b0f2ebdfb3591e411e268aa81998d4723