tree 20190e34a43ff35e3cb8d665b3b3bfa2f1beadaf
parent 2363ccb505c15328580d5f64b5e9ea5c1c8a1462
parent 78b9ae307bded23cd8b239562d3a832dad585bdd
parent 6b5eab54691956b27669ce726cbd8ef2d8ec1e50
parent 7d284352f9cbc032f2294024b1a6b5c06765c246
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1429834732 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1429834732 +0200

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()