From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 7 May 2015 19:24:34 +0000 (+0200)
Subject: Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a5d9315e41cc0dfc97a3b0a8e222d30566cf3fe;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'

* acpi-resources:
  x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on PCI bus

* acpi-battery:
  ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook

* acpi-doc:
  ACPI / documentation: Fix ambiguity in the GPIO properties document
  ACPI / documentation: fix a sentence about GPIO resources

* acpi-pnp:
  ACPI / PNP: add two IDs to list for PNPACPI device enumeration
---

9a5d9315e41cc0dfc97a3b0a8e222d30566cf3fe