aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 04:50:44 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-13 04:50:44 +0100
commitf6411fe7e09b67470a2569231d6fa566c7c29b8b (patch)
treef12d569c70ff937175eb5cde2195fccfe2fa34eb /kernel
parentsched: add avg_overlap decay (diff)
parentx86, sched_clock(): mark variables read-mostly (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff)
downloadlinux-dev-f6411fe7e09b67470a2569231d6fa566c7c29b8b.tar.xz
linux-dev-f6411fe7e09b67470a2569231d6fa566c7c29b8b.zip
Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core