Merge back PM tools material for v4.13.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Jun 2017 23:42:51 +0000 (01:42 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Jun 2017 23:42:51 +0000 (01:42 +0200)

Trivial merge