Merge back earlier ACPI PM material for v4.3.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 31 Jul 2015 19:40:03 +0000 (21:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 31 Jul 2015 19:40:03 +0000 (21:40 +0200)

Trivial merge