Merge branches 'acpi-scan', 'acpi-sysfs', 'acpi-wdat' and 'acpi-tables'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Jan 2017 13:36:30 +0000 (14:36 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Jan 2017 13:36:30 +0000 (14:36 +0100)
commitf1dabf0b0975f9e71344b5c8c0ab39c4d58d9274
tree7b3795baa431ccb63de831e13087b204f6382e58
parentc2a6bbaf0c5f90463a7011a295bbdb7e33c80b51
parent9c4aa1eecb48cfac18ed5e3aca9d9ae58fbafc11
parentc6e2c1e1138fa5cb5bb99381132855bbaf712029
parent696c7f8e0373026e8bfb29b2d9ff2d0a92059d4d
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()