Merge branches 'acpi-button' and 'acpi-tools'

* acpi-button:
  Revert "ACPI / button: Remove lid_init_state=method mode"

* acpi-tools:
  tools/power/acpi: Add .gitignore file

diff --combined drivers/acpi/button.c
index b7c2a06963d6fb79cb5f5aaa2576936d17d5088f,6d5a8c1d313269eaa2a18fcb1fdc611e90ccf1b9,668137e4a0697cf230b074e13cbb6dd255c7bf59..25aba9b107dd51db522225b5171e7017a5a3ec9d
--- 1/drivers/acpi/button.c
--- 2/drivers/acpi/button.c
--- 3/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@@@ -57,6 -57,7 -57,6 +57,7 @@@@
   
   #define ACPI_BUTTON_LID_INIT_IGNORE  0x00
   #define ACPI_BUTTON_LID_INIT_OPEN    0x01
+ +#define ACPI_BUTTON_LID_INIT_METHOD  0x02
   
   #define _COMPONENT           ACPI_BUTTON_COMPONENT
   ACPI_MODULE_NAME("button");
@@@@ -216,7 -217,7 -216,7 +217,7 @@@@ static int acpi_lid_notify_state(struc
        }
   
        if (state)
 --             pm_wakeup_event(&device->dev, 0);
 ++             pm_wakeup_hard_event(&device->dev);
   
        ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);
        if (ret == NOTIFY_DONE)
@@@@ -376,6 -377,9 -376,6 +377,9 @@@@ static void acpi_lid_initialize_state(s
        case ACPI_BUTTON_LID_INIT_OPEN:
                (void)acpi_lid_notify_state(device, 1);
                break;
+ +     case ACPI_BUTTON_LID_INIT_METHOD:
+ +             (void)acpi_lid_update_state(device);
+ +             break;
        case ACPI_BUTTON_LID_INIT_IGNORE:
        default:
                break;
@@@@ -398,7 -402,7 -398,7 +402,7 @@@@ static void acpi_button_notify(struct a
                } else {
                        int keycode;
   
 --                     pm_wakeup_event(&device->dev, 0);
 ++                     pm_wakeup_hard_event(&device->dev);
                        if (button->suspended)
                                break;
   
@@@@ -530,7 -534,6 -530,6 +534,7 @@@@ static int acpi_button_add(struct acpi_
                lid_device = device;
        }
   
 ++     device_init_wakeup(&device->dev, true);
        printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));
        return 0;
   
@@@@ -560,6 -563,9 -559,6 +564,9 @@@@ static int param_set_lid_init_state(con
        if (!strncmp(val, "open", sizeof("open") - 1)) {
                lid_init_state = ACPI_BUTTON_LID_INIT_OPEN;
                pr_info("Notify initial lid state as open\n");
+ +     } else if (!strncmp(val, "method", sizeof("method") - 1)) {
+ +             lid_init_state = ACPI_BUTTON_LID_INIT_METHOD;
+ +             pr_info("Notify initial lid state with _LID return value\n");
        } else if (!strncmp(val, "ignore", sizeof("ignore") - 1)) {
                lid_init_state = ACPI_BUTTON_LID_INIT_IGNORE;
                pr_info("Do not notify initial lid state\n");
@@@@ -573,6 -579,8 -572,6 +580,8 @@@@ static int param_get_lid_init_state(cha
        switch (lid_init_state) {
        case ACPI_BUTTON_LID_INIT_OPEN:
                return sprintf(buffer, "open");
+ +     case ACPI_BUTTON_LID_INIT_METHOD:
+ +             return sprintf(buffer, "method");
        case ACPI_BUTTON_LID_INIT_IGNORE:
                return sprintf(buffer, "ignore");
        default: