]> err.no Git - linux-2.6/commit
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Aug 2008 18:26:02 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Aug 2008 18:26:02 +0000 (11:26 -0700)
commitcc556c5c92a45763e23015a31efb27005a6132fa
tree80765cc72264717cdff9119ff9438a0815c2e09d
parenta56cb4ecbdb66a504601dfacc31cd0cf91c97e7f
parent354879bb977e06695993435745f06a0f6d39ce2b
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 cpu_clock()