Merge branches 'acpi-button', 'acpi-battery' and 'acpi-doc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 1 Oct 2016 23:40:20 +0000 (01:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 1 Oct 2016 23:40:20 +0000 (01:40 +0200)
commit8c4b172123c08a7138ee01675c130c83f9c1117c
treeb1a1d945bed3a76dffebe37c07f315992ece2e78
parent0137a337d7760c265a7d126964297e41ba9a1cb3
parentf9151fcfcdfc662d4bfd74abf60c5e42722acf40
parent12c78ca2ab5e64b636ce085fb08f7685654a5f22
parent060d791f760bd80c0f96de668a662cab0286146a
Merge branches 'acpi-button', 'acpi-battery' and 'acpi-doc'

* acpi-button:
  ACPI / button: Add document for ACPI control method lid device restrictions
  ACPI / button: Fix an issue in button.lid_init_state=ignore mode

* acpi-battery:
  ACPI / battery: Add sysfs representation after checking _BST

* acpi-doc:
  ACPI / documentation: Use recommended name in GPIO property names