Merge branches 'acpi-button' and 'acpi-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 22 May 2017 18:29:06 +0000 (20:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 22 May 2017 18:29:06 +0000 (20:29 +0200)
commite3170cc04d7ccf0e644ee3e3263e2df7a7685936
treed9020b26f67bbfd3e821e7087eb81b7a63a6fbc6
parent08332893e37af6ae779367e78e444f8f9571511d
parentf369fdf4f661322b73f3307e9f3cd55fb3a20123
parentbdce57e7ae9cac56cda958029104c752afaf0894
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
drivers/acpi/button.c