tree cc78762bc0fb471562ca1b5f745834a983020623
parent e09b4e9a8d15dce04bedf1b860abeec00de31aad
parent cd7240c0b900eb6d690ccee088a6c9b46dae815a
author Linus Torvalds <torvalds@linux-foundation.org> 1282750856 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282750856 -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, sched: Recompute cyc2ns_offset's during resume from sleep states
  sched: Fix rq->clock synchronization when migrating tasks