diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-20 15:55:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-20 15:55:48 -0700 |
| commit | acc11eab70591744369722280c9ce162a6193494 (patch) | |
| tree | f23138ad28b557311b6e512f40ec27fbc42481f1 /lib/fault-inject.c | |
| parent | 919d25a710bd6ded210426e911c9f9ec535d8d9c (diff) | |
| parent | d110235d2c331c4f79e0879f51104be79e17a469 (diff) | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Avoid creating superfluous NUMA domains on non-NUMA systems
sched: Allow for overlapping sched_domain spans
sched: Break out cpu_power from the sched_group structure
Diffstat (limited to 'lib/fault-inject.c')
0 files changed, 0 insertions, 0 deletions