]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branches 'acpi-ec' and 'acpi-button'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Aug 2016 14:04:49 +0000 (16:04 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Aug 2016 14:04:49 +0000 (16:04 +0200)
* acpi-ec:
  ACPI / EC: Work around method reentrancy limit in ACPICA for _Qxx

* acpi-button:
  ACPI / button: remove pointer to old lid_sysfs on unbind

1  2  3 
drivers/acpi/ec.c

Simple merge