Merge back earlier PM tools material for v4.18.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 3 Jun 2018 08:12:30 +0000 (10:12 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 3 Jun 2018 08:12:30 +0000 (10:12 +0200)

Trivial merge