Merge branch 'pm-qos' into pm-cpuidle
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 8 Nov 2017 11:15:50 +0000 (12:15 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 8 Nov 2017 11:15:50 +0000 (12:15 +0100)

Trivial merge