From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Aug 2010 15:40:56 +0000 (-0700)
Subject: Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.36-rc3~25
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=5e686019df425a4fd8003ce7f6eaccbe537331d8

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, sched: Recompute cyc2ns_offset's during resume from sleep states
  sched: Fix rq->clock synchronization when migrating tasks
---

5e686019df425a4fd8003ce7f6eaccbe537331d8