diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 11:30:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 11:30:56 -0700 |
| commit | 040b9d7ccff40e1fbd48029e3c769db188a3ba2c (patch) | |
| tree | 43ab6312d5108302c4b67753597850275a9ee4ed /include/net/nsh.h | |
| parent | e6328a7abe7f8fcd32e9d3bcbd14ff2161bf71c9 (diff) | |
| parent | 46123355af729514e6fa8b8a9dd1e645e61a6466 (diff) | |
| download | op-kernel-dev-040b9d7ccff40e1fbd48029e3c769db188a3ba2c.zip op-kernel-dev-040b9d7ccff40e1fbd48029e3c769db188a3ba2c.tar.gz | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Three fixes:
- fix a suspend/resume cpusets bug
- fix a !CONFIG_NUMA_BALANCING bug
- fix a kerneldoc warning"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/fair: Fix nuisance kernel-doc warning
sched/cpuset/pm: Fix cpuset vs. suspend-resume bugs
sched/fair: Fix wake_affine_llc() balancing rules
Diffstat (limited to 'include/net/nsh.h')
0 files changed, 0 insertions, 0 deletions
