Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commit84d88d5d4efc37dfb8a93a4a58d8a227ee86ffa4
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Sep 2009 22:10:40 +0000 (30 15:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Sep 2009 22:10:40 +0000 (30 15:10 -0700)
tree8dc2761f3111a7dfee01f290f2659faaa24ec06e
parente399835c349b7d8339775a004a86a492a444e230
parent152f9d0710a62708710161bce1b29fa8292c8c11
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:
  sched_clock: Fix atomicity/continuity bug by using cmpxchg64()
  x86: Provide an alternative() based cmpxchg64()