diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-22 20:29:06 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-22 20:29:06 +0200 |
| commit | e3170cc04d7ccf0e644ee3e3263e2df7a7685936 (patch) | |
| tree | d9020b26f67bbfd3e821e7087eb81b7a63a6fbc6 /tools | |
| parent | Linux 4.12-rc2 (diff) | |
| parent | Revert "ACPI / button: Remove lid_init_state=method mode" (diff) | |
| parent | tools/power/acpi: Add .gitignore file (diff) | |
| download | linux-dev-e3170cc04d7ccf0e644ee3e3263e2df7a7685936.tar.xz linux-dev-e3170cc04d7ccf0e644ee3e3263e2df7a7685936.zip | |
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