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 | |
| parent | 08332893e37af6ae779367e78e444f8f9571511d (diff) | |
| parent | f369fdf4f661322b73f3307e9f3cd55fb3a20123 (diff) | |
| parent | bdce57e7ae9cac56cda958029104c752afaf0894 (diff) | |
| download | linux-e3170cc04d7ccf0e644ee3e3263e2df7a7685936.tar.gz linux-e3170cc04d7ccf0e644ee3e3263e2df7a7685936.tar.bz2 linux-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