aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 13:54:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 13:54:49 -0700
commit17489c058e8c63ab5ebdc67ab52ca70d1bc270b1 (patch)
treed0e0a3503967b11f6e86ebfaddf103a82fbea38f /net
parentMerge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
parentMerge commit 'v2.6.26' into sched/devel (diff)
downloadlinux-dev-17489c058e8c63ab5ebdc67ab52ca70d1bc270b1.tar.xz
linux-dev-17489c058e8c63ab5ebdc67ab52ca70d1bc270b1.zip
Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (76 commits) sched_clock: and multiplier for TSC to gtod drift sched_clock: record TSC after gtod sched_clock: only update deltas with local reads. sched_clock: fix calculation of other CPU sched_clock: stop maximum check on NO HZ sched_clock: widen the max and min time sched_clock: record from last tick sched: fix accounting in task delay accounting & migration sched: add avg-overlap support to RT tasks sched: terminate newidle balancing once at least one task has moved over sched: fix warning sched: build fix sched: sched_clock_cpu() based cpu_clock(), lockdep fix sched: export cpu_clock sched: make sched_{rt,fair}.c ifdefs more readable sched: bias effective_load() error towards failing wake_affine(). sched: incremental effective_load() sched: correct wakeup weight calculations sched: fix mult overflow sched: update shares on wakeup ...
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions