summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-08-05 17:04:49 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-08-05 17:04:49 +0300
commit4dc14b343d47426858f3fb1c8669059b7e3f98d4 (patch)
tree8287bf555312ce47e1f027dc864cad3e35890a43 /drivers
parente663107fa1edda4d8a0d5b8ce704d71f8e27de43 (diff)
parente1191bd4f62d9086a1a47adc286e7fcffc1fa55c (diff)
parente370cc8640305aa2fa42b852cccd89e80c28d9a0 (diff)
downloadlinux-4dc14b343d47426858f3fb1c8669059b7e3f98d4.tar.xz
Merge branches 'acpi-ec' and 'acpi-button'
* 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