diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 01:40:20 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 01:40:20 +0200 |
| commit | 8c4b172123c08a7138ee01675c130c83f9c1117c (patch) | |
| tree | b1a1d945bed3a76dffebe37c07f315992ece2e78 /drivers/acpi | |
| parent | 0137a337d7760c265a7d126964297e41ba9a1cb3 (diff) | |
| parent | f9151fcfcdfc662d4bfd74abf60c5e42722acf40 (diff) | |
| parent | 12c78ca2ab5e64b636ce085fb08f7685654a5f22 (diff) | |
| parent | 060d791f760bd80c0f96de668a662cab0286146a (diff) | |
| download | linux-8c4b172123c08a7138ee01675c130c83f9c1117c.tar.gz linux-8c4b172123c08a7138ee01675c130c83f9c1117c.tar.bz2 linux-8c4b172123c08a7138ee01675c130c83f9c1117c.zip | |
Merge branches 'acpi-button', 'acpi-battery' and 'acpi-doc'
* acpi-button:
ACPI / button: Add document for ACPI control method lid device restrictions
ACPI / button: Fix an issue in button.lid_init_state=ignore mode
* acpi-battery:
ACPI / battery: Add sysfs representation after checking _BST
* acpi-doc:
ACPI / documentation: Use recommended name in GPIO property names