Merge branches 'acpi-button', 'acpi-tables' and 'acpi-battery' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 12 Sep 2016 12:48:35 +0000 (14:48 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 12 Sep 2016 12:48:35 +0000 (14:48 +0200)
commit35e92c5f105074104cbe6f065bd31bd8c5c4d908
tree457dc00dca87bfbf20e992a8ee098a7611c59230
parent0bb4a2ba5ecec3849bac9d0bbcdfea24113ce40b
parentf9151fcfcdfc662d4bfd74abf60c5e42722acf40
parent99b0efd7c886f4c985cb2727a86548413922cbe2
parent12c78ca2ab5e64b636ce085fb08f7685654a5f22
Merge branches 'acpi-button', 'acpi-tables' and 'acpi-battery' into linux-next

* 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-tables:
  ACPI / tables: do not report the number of entries ignored by acpi_parse_entries()
  ACPI / tables: fix acpi_parse_entries_array() so it traverses all subtables
  ACPI / tables: fix incorrect counts returned by acpi_parse_entries_array()

* acpi-battery:
  ACPI / battery: Add sysfs representation after checking _BST
This page took 0.026371 seconds and 5 git commands to generate.