summaryrefslogtreecommitdiffstats
path: root/kernel/sched_fair.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 21:12:58 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 21:12:58 +0200
commit8b9686ff4ddfdf45662024edd567920e6db87beb (patch)
tree1d7e1d735121ea3c44ab72a24506151e4e88a36e /kernel/sched_fair.c
parentMerge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentx86-32, fpu: Fix FPU exception handling on non-SSE systems (diff)
parentsched: Clean up rebalance_domains() load-balance interval calculation (diff)
parentx86/mrst/vrtc: Fix boot crash in mrst_rtc_init() (diff)
parentgenirq: Fix cpumask leak in __setup_irq() (diff)
parentMerge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff)
downloadlinux-8b9686ff4ddfdf45662024edd567920e6db87beb.tar.xz
linux-8b9686ff4ddfdf45662024edd567920e6db87beb.zip
Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for-linus', 'irq-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-32, fpu: Fix FPU exception handling on non-SSE systems x86, hibernate: Initialize mmu_cr4_features during boot x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change x86: visws: Fixup irq overhaul fallout * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Clean up rebalance_domains() load-balance interval calculation * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/mrst/vrtc: Fix boot crash in mrst_rtc_init() rtc, x86/mrst/vrtc: Fix boot crash in rtc_read_alarm() * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Fix cpumask leak in __setup_irq() * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf probe: Fix listing incorrect line number with inline function perf probe: Fix to find recursively inlined function perf probe: Fix multiple --vars options behavior perf probe: Fix to remove redundant close perf probe: Fix to ensure function declared file