Merge branches 'acpi-scan' and 'acpi-ec'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 31 Oct 2014 21:24:44 +0000 (22:24 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 31 Oct 2014 21:24:44 +0000 (22:24 +0100)
commit76dfdc2c6ed8cd9dde0d18091c2cf41b1e378be4
tree184b60fc3b439c5b7eb0f23299ad5ea34357b091
parentcac7f2429872d3733dc3f9915857b1691da2eb2f
parent52870786ff5d06540efacc64ca8faa74221f10dd
parent79149001105f18bd2285ada109f9229ea24a7571
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"