Merge branches 'acpi-pnp' and 'acpi-blacklist'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Oct 2014 20:25:20 +0000 (22:25 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Oct 2014 20:25:20 +0000 (22:25 +0200)
commitdbcbe68bb76c4f8057160209859ecd7c75e86c30
tree0783aae484ed2b4eac9a2ade748ed6d1837da1f7
parenta13f453140d542f9d5a0ee15601531c72e5401d7
parent4990141496b82f91cb96b37100ac882ea5cee8b7
parent8ee4104a681a3a30a495265825d8ebfe87d57d28
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