Merge back new cpuidle material for v4.7.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 May 2016 20:08:46 +0000 (22:08 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 May 2016 20:08:46 +0000 (22:08 +0200)

Trivial merge