summaryrefslogtreecommitdiff
path: root/net/sysctl_net.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-24 22:22:53 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-24 22:22:53 +0200
commitd5d6c1ddb93a7225915cd7e89f35944878d667f9 (patch)
tree43ae64820759d0b1d94152c70d06b2e24e7e4bff /net/sysctl_net.c
parent9b40eebcd339c47921ff8b04c77af7c762b74216 (diff)
parent98529b9272e06a7767034fb8a32e43cdecda240a (diff)
parentb5212f57da145e53df790a7e211d94daac768bf8 (diff)
Merge branches 'acpica-fix', 'acpi-ec-fix' and 'acpi-properties-fix'
* acpica-fix: ACPICA: Fix acpi_evaluate_object_typed() * acpi-ec-fix: ACPI: EC: Fix regression related to wrong ECDT initialization order * acpi-properties-fix: ACPI: device property: Fix node lookup in acpi_graph_get_child_prop_value()