diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-20 14:28:51 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-20 14:28:51 +0100 |
| commit | ac18c0c4e2b1f84fc11d013cd7363377ae4cde43 (patch) | |
| tree | a83a30993d849c418a2da2b24657dbe5b52810db /net | |
| parent | a74d1cafc22e100a9b59c50943ca09c37e03dce8 (diff) | |
| parent | c3a696b6e8f8f75f9f75e556a9f9f6472eae2655 (diff) | |
| parent | ecb10b694b72ca5ea51b3c90a71ff2a11963425a (diff) | |
| parent | d222678426faa5b0a5c14a468f78c32beb089937 (diff) | |
Merge branches 'acpi-ec', 'acpi-button' and 'acpi-apei'
* acpi-ec:
ACPI / EC: Use busy polling mode when GPE is not enabled
ACPI / EC: Remove old CLEAR_ON_RESUME quirk
* acpi-button:
ACPI / button: Remove lid_init_state=method mode
ACPI / button: Change default behavior to lid_init_state=open
* acpi-apei:
ACPI, APEI, EINJ: fix malformed newline escape