summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-05 22:25:20 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-05 22:25:20 +0200
commitdbcbe68bb76c4f8057160209859ecd7c75e86c30 (patch)
tree0783aae484ed2b4eac9a2ade748ed6d1837da1f7 /drivers/acpi
parenta13f453140d542f9d5a0ee15601531c72e5401d7 (diff)
parent4990141496b82f91cb96b37100ac882ea5cee8b7 (diff)
parent8ee4104a681a3a30a495265825d8ebfe87d57d28 (diff)
Merge branches 'acpi-pnp' and 'acpi-blacklist'
* acpi-pnp: ACPI / PNP: remove Fujitsu device IDs from ACPI PNP ID list * acpi-blacklist: ACPI / blacklist: add Win8 OSI quirks for some Dell laptop models