diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-08-05 14:04:49 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-08-05 14:04:49 (GMT) |
| commit | 4dc14b343d47426858f3fb1c8669059b7e3f98d4 (patch) | |
| tree | 8287bf555312ce47e1f027dc864cad3e35890a43 /net/dccp/sysctl.c | |
| parent | e663107fa1edda4d8a0d5b8ce704d71f8e27de43 (diff) | |
| parent | e1191bd4f62d9086a1a47adc286e7fcffc1fa55c (diff) | |
| parent | e370cc8640305aa2fa42b852cccd89e80c28d9a0 (diff) | |
| download | linux-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