From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 12 Sep 2016 12:48:35 +0000 (+0200)
Subject: Merge branches 'acpi-button', 'acpi-tables' and 'acpi-battery' into linux-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=35e92c5f105074104cbe6f065bd31bd8c5c4d908;p=deliverable%2Flinux.git

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

35e92c5f105074104cbe6f065bd31bd8c5c4d908