From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 7 Dec 2012 22:14:11 +0000 (+0100)
Subject: Merge branch 'acpi-dev-pm'
X-Git-Tag: firefly_0821_release~3680^2~1523^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8ab788f00263e886a5ac74b51ee0a226e4363795;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-dev-pm'

* acpi-dev-pm:
  ACPI / PM: Fix header of acpi_dev_pm_detach() in acpi.h
---

8ab788f00263e886a5ac74b51ee0a226e4363795