tree 3e03cfd79dd3d629ee46bb04771d79250fe52ad3
parent 67a077dca4e648a662e32cbeaaba8094d2e30229
parent e26b33e9552c29c1d3fe67dc602c6264c29f5dc7
author Linus Torvalds <torvalds@linux-foundation.org> 1218498391 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1218498391 -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:
  sched, cpu hotplug: fix set_cpus_allowed() use in hotplug callbacks
  sched: fix mysql+oltp regression
  sched_clock: delay using sched_clock()
  sched clock: couple local and remote clocks
  sched clock: simplify __update_sched_clock()
  sched: eliminate scd->prev_raw
  sched clock: clean up sched_clock_cpu()
  sched clock: revert various sched_clock() changes
  sched: move sched_clock before first use
  sched: test runtime rather than period in global_rt_runtime()
  sched: fix SCHED_HRTICK dependency
  sched: fix warning in hrtick_start_fair()