merge

diff --cc drivers/acpi/osl.c
index 9832172521d7007bce5d296d79f31b0a01e4c65c,6f7771bfebbed2176682e26f2fb27cb1fb2c0f90..b3b5ee011d44cff5cc97f9949af244f8f207dea8
--- 1/drivers/acpi/osl.c
--- 2/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@ -1123,5 -1076,14 +1123,13 @@@ acpi_wake_gpes_always_on_setup(char *st
        return 1;
  }
  
 -__setup("acpi_leave_gpes_disabled", acpi_leave_gpes_disabled_setup);
 +__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
  
 -
+ /*
+  * acpi_cstate_limit is defined in the base kernel so modules can
+  * change it w/o depending on the state of the processor module.
+  */
+ unsigned int acpi_cstate_limit = ACPI_C_STATES_MAX;
+ 
+ 
+ EXPORT_SYMBOL(acpi_cstate_limit);

diff --cc drivers/acpi/processor.c
Simple merge

diff --cc include/linux/acpi.h
Simple merge