diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 18:42:56 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 18:42:56 +0100 |
| commit | be10f60d29433f712bf0887431efb80975e64438 (patch) | |
| tree | 76e1c30e5702babb16d3dc7b1e49c47a21e9e0c0 | |
| parent | ae5056e8573c99c51acc4d77b287118ac015b4c1 (diff) | |
| parent | 80167a24a27449c06fbbfb1b0f4a5b965c41b428 (diff) | |
| parent | c48cf1b9dd8f01358e5385d40fb58061f32313a7 (diff) | |
| parent | 175f8e2650f7ca6b33d338be3ccc1c00e89594ea (diff) | |
Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'
* acpi-scan:
ACPI / scan: Change the level of _DEP-related messages to KERN_DEBUG
* acpi-utils:
ACPI / utils: Drop error messages from acpi_evaluate_reference()
* acpi-pm:
ACPI / PM: Do not disable wakeup GPEs that have not been enabled