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
This commit is contained in:
Rafael J. Wysocki
2017-05-22 20:29:06 +02:00
3 changed files with 25 additions and 4 deletions

4
tools/power/acpi/.gitignore vendored Normal file
View File

@@ -0,0 +1,4 @@
acpidbg
acpidump
ec
include