From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 6 Jan 2017 13:36:30 +0000 (+0100)
Subject: Merge branches 'acpi-scan', 'acpi-sysfs', 'acpi-wdat' and 'acpi-tables'
X-Git-Tag: v4.10-rc3~15^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f1dabf0b0975f9e71344b5c8c0ab39c4d58d9274;p=linux-2.6-block.git

Merge branches 'acpi-scan', 'acpi-sysfs', 'acpi-wdat' and 'acpi-tables'

* acpi-scan:
  ACPI / scan: Prefer devices without _HID/_CID for _ADR matching
  ACPI: Drop misplaced acpi_dma_deconfigure() call from acpi_bind_one()

* acpi-sysfs:
  ACPI / sysfs: Provide quirk mechanism to prevent GPE flooding

* acpi-wdat:
  ACPI / watchdog: Print out error number when device creation fails

* acpi-tables:
  ACPI / DMAR: Avoid passing NULL to acpi_put_table()
---

f1dabf0b0975f9e71344b5c8c0ab39c4d58d9274