Merge back earlier cpuidle material for v3.13.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 7 Oct 2013 19:31:21 +0000 (21:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 7 Oct 2013 19:31:21 +0000 (21:31 +0200)

Trivial merge