3eb3963fd1
Conflicts: arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c arch/x86/kernel/tlb_32.c Merge it here because both the cpumask changes and the ongoing percpu work is touching the TLB code. The percpu changes take precedence, as they eliminate tlb_32.c altogether. Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
|---|---|---|
| .. | ||
| configs | ||
| dig | ||
| hp | ||
| ia32 | ||
| include/asm | ||
| kernel | ||
| kvm | ||
| lib | ||
| mm | ||
| oprofile | ||
| pci | ||
| scripts | ||
| sn | ||
| uv | ||
| xen | ||
| Kconfig | ||
| Kconfig.debug | ||
| Makefile | ||
| install.sh | ||
| module.lds | ||