From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Sep 2010 14:59:49 +0000 (-0700)
Subject: Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aad1830e6b978f5d90e5d81d071e1752f526f732;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'sched-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, tsc: Fix a preemption leak in restore_sched_clock_state()
  sched: Move sched_avg_update() to update_cpu_load()
---

aad1830e6b978f5d90e5d81d071e1752f526f732