tree 8dc2761f3111a7dfee01f290f2659faaa24ec06e
parent e399835c349b7d8339775a004a86a492a444e230
parent 152f9d0710a62708710161bce1b29fa8292c8c11
author Linus Torvalds <torvalds@linux-foundation.org> 1254348640 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1254348640 -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_clock: Fix atomicity/continuity bug by using cmpxchg64()
  x86: Provide an alternative() based cmpxchg64()