Merge branch 'linus' into cpus4096
Ingo Molnar [Fri, 18 Jul 2008 20:00:54 +0000 (22:00 +0200)]
Conflicts:

drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
drivers/acpi/processor_throttling.c
kernel/cpu.c

@@@ -1034,8 -1034,8 +1034,8 @@@ int acpi_processor_set_throttling(struc
                 * it is necessary to set T-state for every affected
                 * cpus.
                 */
 -              for_each_cpu_mask(i, online_throttling_cpus) {
 +              for_each_cpu_mask_nr(i, online_throttling_cpus) {
-                       match_pr = processors[i];
+                       match_pr = per_cpu(processors, i);
                        /*
                         * If the pointer is invalid, we will report the
                         * error message and continue.
diff --cc kernel/cpu.c
Simple merge