Merge back earlier 'pm-cpuidle' material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Aug 2013 20:18:04 +0000 (22:18 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Aug 2013 20:18:04 +0000 (22:18 +0200)

Trivial merge