Merge back earlier cpuidle changes for v4.8.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 8 Jul 2016 23:04:44 +0000 (01:04 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 8 Jul 2016 23:04:44 +0000 (01:04 +0200)

Trivial merge