Merge branch 'linus' into cpus4096

Conflicts:

	drivers/acpi/processor_throttling.c

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

diff --cc drivers/acpi/processor_throttling.c
index 28509fbba6f9cc20a11af6ab0836f0a2213d2674,0622ace05220b26d02ff6b72c49155a67e71213c..a56fc6c4394bb1dab26cb06527d3f89239333683
--- 1/drivers/acpi/processor_throttling.c
--- 2/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.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