tree af5ba1a5ce1574201e4b4da0366a19a4149e0f8c
parent 3e6dce76d99b328716b43929b9195adfee1de00c
parent 55496c896b8a695140045099d4e0175cf09d4eae
author Linus Torvalds <torvalds@linux-foundation.org> 1284217189 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1284217189 -0700

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()