Merge back earlier cpuidle changes for v4.7.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 26 Apr 2016 00:30:00 +0000 (02:30 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 26 Apr 2016 00:30:00 +0000 (02:30 +0200)

Trivial merge