Merge back earlier 'pm-tools' material for v3.20
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 9 Feb 2015 22:45:27 +0000 (23:45 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 9 Feb 2015 22:45:27 +0000 (23:45 +0100)

Trivial merge