]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* 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"


Trivial merge