aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-24 02:18:52 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-24 02:18:52 +0200
commite0155a99b28f63e007c0c74076ad8ae486a3c9d3 (patch)
tree20190e34a43ff35e3cb8d665b3b3bfa2f1beadaf
parent2363ccb505c15328580d5f64b5e9ea5c1c8a1462 (diff)
parent78b9ae307bded23cd8b239562d3a832dad585bdd (diff)
parent6b5eab54691956b27669ce726cbd8ef2d8ec1e50 (diff)
parent7d284352f9cbc032f2294024b1a6b5c06765c246 (diff)
downloadlinux-stericsson-e0155a99b28f63e007c0c74076ad8ae486a3c9d3.tar.gz
Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan'
* acpi-dock: MAINTAINERS: remove maintainship entry of docking station driver * acpi-ec: ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler() * acpi-scan: ACPI / scan: Add a scan handler for PRP0001 ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()