| commit | 3eb3963fd1974c63e9bb3cfe774abc3e1995e479 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Jan 21 10:14:17 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Jan 21 10:14:17 2009 +0100 |
| tree | c00d6c2e8484793ab6bd0644db59bbdf5e9429c5 | |
| parent | ae2b56b92bd33b416528986528e0732c98c7a285 [diff] | |
| parent | 5766b842b23c6b40935a5f3bd435b2bcdaff2143 [diff] |
Merge branch 'cpus4096' into core/percpu 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>