aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
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 /kernel
parentMerge branches 'pm-cpufreq', 'powercap' and 'pm-tools' (diff)
parentMAINTAINERS: remove maintainship entry of docking station driver (diff)
parentACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler() (diff)
parentACPI / scan: Add a scan handler for PRP0001 (diff)
downloadlinux-dev-e0155a99b28f63e007c0c74076ad8ae486a3c9d3.tar.xz
linux-dev-e0155a99b28f63e007c0c74076ad8ae486a3c9d3.zip
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()