Pull d-states into release branch

Conflicts:

	drivers/acpi/sleep/main.c

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc drivers/acpi/sleep/main.c
index 54c2dfcf86511dec831693c86c0494f16e6a1028,29bdb013f46cd85cdb82786ba3ee3cefa413d305..ab21357c5c7b7d60dd15883981ea3016a94963b2
--- 1/drivers/acpi/sleep/main.c
--- 2/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@@ -136,7 -152,8 +152,9 @@@ static int acpi_pm_finish(suspend_state
        /* reset firmware waking vector */
        acpi_set_firmware_waking_vector((acpi_physical_address) 0);
  
+       acpi_target_sleep_state = ACPI_STATE_S0;
+ 
 +#ifdef CONFIG_X86
        if (init_8259A_after_S1) {
                printk("Broken toshiba laptop -> kicking interrupts\n");
                init_8259A(0);

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