1
0
Files
linux/arch/x86/kernel/cpu
Ingo Molnar 3eb3963fd1 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>
2009-01-21 10:14:17 +01:00
..
2008-06-03 14:43:00 -07:00
2008-07-31 23:56:27 +02:00
2009-01-21 17:26:06 +09:00
2008-09-04 21:09:45 +02:00
2008-11-23 11:02:36 +01:00