Merge back earlier PM core material for v4.16.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 11 Dec 2017 13:25:48 +0000 (14:25 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 11 Dec 2017 13:25:48 +0000 (14:25 +0100)

Trivial merge