summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-31 22:24:44 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-31 22:24:44 +0100
commit76dfdc2c6ed8cd9dde0d18091c2cf41b1e378be4 (patch)
tree184b60fc3b439c5b7eb0f23299ad5ea34357b091 /drivers
parentcac7f2429872d3733dc3f9915857b1691da2eb2f (diff)
parent52870786ff5d06540efacc64ca8faa74221f10dd (diff)
parent79149001105f18bd2285ada109f9229ea24a7571 (diff)
downloadlinux-76dfdc2c6ed8cd9dde0d18091c2cf41b1e378be4.tar.bz2
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"