Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 24 Apr 2015 00:18:52 +0000 (02:18 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 24 Apr 2015 00:18:52 +0000 (02:18 +0200)
* 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()


Trivial merge