From: Ingo Molnar Date: Wed, 21 Jan 2009 09:14:17 +0000 (+0100) Subject: Merge branch 'cpus4096' into core/percpu X-Git-Tag: v2.6.30-rc1~2^2~50^2~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eb3963fd1974c63e9bb3cfe774abc3e1995e479;p=thirdparty%2Flinux.git 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 --- 3eb3963fd1974c63e9bb3cfe774abc3e1995e479