summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-01-06 14:36:30 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-01-06 14:36:30 +0100
commitf1dabf0b0975f9e71344b5c8c0ab39c4d58d9274 (patch)
tree7b3795baa431ccb63de831e13087b204f6382e58 /Documentation
parentc2a6bbaf0c5f90463a7011a295bbdb7e33c80b51 (diff)
parent9c4aa1eecb48cfac18ed5e3aca9d9ae58fbafc11 (diff)
parentc6e2c1e1138fa5cb5bb99381132855bbaf712029 (diff)
parent696c7f8e0373026e8bfb29b2d9ff2d0a92059d4d (diff)
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()