Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Sep 2010 14:59:49 +0000 (07:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Sep 2010 14:59:49 +0000 (07:59 -0700)
commitaad1830e6b978f5d90e5d81d071e1752f526f732
treeaf5ba1a5ce1574201e4b4da0366a19a4149e0f8c
parent3e6dce76d99b328716b43929b9195adfee1de00c
parent55496c896b8a695140045099d4e0175cf09d4eae
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()
kernel/sched_fair.c