commit | 805c52815825b1ed2e3249508ce5ffa5aeae5d1d | [log] [tgz] |
---|---|---|
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Sun Jul 27 23:55:19 2014 +0200 |
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Sun Jul 27 23:55:19 2014 +0200 |
tree | 5ef247bc84fe822347cac1fdf384236c38f860cf | |
parent | a60b23994e405f65430ba5b7cdf616221b4367b7 [diff] | |
parent | 17653a3e098dc20ae1db7459344a81c386625696 [diff] | |
parent | 821d6f0359b0614792ab8e2fb93b503e25a65079 [diff] | |
parent | e71eeb2a6bcc6282b95215eb353a3ac9ce3e0de3 [diff] |
Merge branches 'acpi-pm', 'acpi-sleep' and 'acpi-button' * acpi-pm: ACPI / PM: Use ACPI_COMPANION() instead of ACPI_HANDLE() ACPI / PM: Always enable wakeup GPEs when enabling device wakeup ACPI / PM: Revork the handling of ACPI device wakeup notifications PM: Create PM workqueue if runtime PM is not configured too * acpi-sleep: ACPI / sleep: Do not save NVS for new machines to accelerate S3 * acpi-button: ACPI / button: Do not propagate wakeup-from-suspend events