From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 24 Apr 2015 00:18:52 +0000 (+0200)
Subject: Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan'
X-Git-Tag: omap-for-v4.1/fixes-rc1~21^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0155a99b28f63e007c0c74076ad8ae486a3c9d3;p=pandora-kernel.git

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

e0155a99b28f63e007c0c74076ad8ae486a3c9d3
Reading git-diff-tree failed