tree 13801d1669efd13e85884609e0a18f3e74b2ede0
parent 6bb7a935489dab20802dde6c2cb7d8582f4849bf
parent 5b16a2212f1840b63d6cc476b26ff9349dab185e
author Linus Torvalds <torvalds@linux-foundation.org> 1224196728 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224196728 -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: prevent scd->clock from moving backwards