diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:13:05 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:13:05 +0900 |
| commit | 0588f1f934791b79d0a1e9b327be9b6eb361d2b8 (patch) | |
| tree | c0b305c494ed32df711c576d9dbd78c8cb394654 /arch/x86/kernel/setup.c | |
| parent | 9d55ab71b735621a63c8923ba934d87879847cef (diff) | |
| parent | 301a5cba2887d1f640e6d5184b05a6d7132017d5 (diff) | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"A CPU hotplug related crash fix and a nohz accounting fixlet."
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched: Update sched_domains_numa_masks[][] when new cpus are onlined
sched: Ensure 'sched_domains_numa_levels' is safe to use in other functions
nohz: Fix one jiffy count too far in idle cputime
Diffstat (limited to 'arch/x86/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions