From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 22 May 2017 18:29:06 +0000 (+0200)
Subject: Merge branches 'acpi-button' and 'acpi-tools'
X-Git-Tag: v4.12-rc3~28^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3170cc04d7ccf0e644ee3e3263e2df7a7685936;p=thirdparty%2Fkernel%2Flinux.git

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
---

e3170cc04d7ccf0e644ee3e3263e2df7a7685936