diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-05 22:25:20 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-05 22:25:20 +0200 |
| commit | dbcbe68bb76c4f8057160209859ecd7c75e86c30 (patch) | |
| tree | 0783aae484ed2b4eac9a2ade748ed6d1837da1f7 /arch/x86 | |
| parent | a13f453140d542f9d5a0ee15601531c72e5401d7 (diff) | |
| parent | 4990141496b82f91cb96b37100ac882ea5cee8b7 (diff) | |
| parent | 8ee4104a681a3a30a495265825d8ebfe87d57d28 (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