| commit | cc556c5c92a45763e23015a31efb27005a6132fa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 25 11:26:02 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 25 11:26:02 2008 -0700 |
| tree | 80765cc72264717cdff9119ff9438a0815c2e09d | |
| parent | a56cb4ecbdb66a504601dfacc31cd0cf91c97e7f [diff] | |
| parent | 354879bb977e06695993435745f06a0f6d39ce2b [diff] |
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()