diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-01 00:24:44 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-01 00:24:44 +0300 |
| commit | 76dfdc2c6ed8cd9dde0d18091c2cf41b1e378be4 (patch) | |
| tree | 184b60fc3b439c5b7eb0f23299ad5ea34357b091 /drivers/acpi | |
| parent | cac7f2429872d3733dc3f9915857b1691da2eb2f (diff) | |
| parent | 52870786ff5d06540efacc64ca8faa74221f10dd (diff) | |
| parent | 79149001105f18bd2285ada109f9229ea24a7571 (diff) | |
| download | linux-76dfdc2c6ed8cd9dde0d18091c2cf41b1e378be4.tar.xz | |
Merge branches 'acpi-scan' and 'acpi-ec'
* acpi-scan:
ACPI: Use ACPI companion to match only the first physical device
* acpi-ec:
ACPI / EC: Fix regression due to conflicting firmware behavior between Samsung and Acer.
Revert "ACPI / EC: Add support to disallow QR_EC to be issued before completing previous QR_EC"