]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf41b4521c6bdb6b7a6a39498bdfd8a59998671a2
treeaf5ba1a5ce1574201e4b4da0366a19a4149e0f8c
parentd914fa3fda1de0ba6afb8b4043af71aab91d54e3
parent26ed6ef9c7d5341f1da5ab51fee298cdbaf4c656
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/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