Merge branch 'acpi-dev-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Dec 2012 22:14:11 +0000 (23:14 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Dec 2012 22:14:11 +0000 (23:14 +0100)
commit8ab788f00263e886a5ac74b51ee0a226e4363795
tree4fb0e0a6c39cf991c415de4148728bfddca029f7
parentbf58cdffac931ff387c657395742a737837b93ca
parentd71f2f88825b31553881944959962b1871099e1f
Merge branch 'acpi-dev-pm'

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