Merge branch 'pm-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Oct 2013 11:41:56 +0000 (13:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Oct 2013 11:41:56 +0000 (13:41 +0200)
commitbdbff71653db2da9c69ff29a02764c388649d08d
tree00a150d88d8d8da3833ab792d58d40eafddde463
parent35f9162d67c3e20a82b4bd6ec538f3e9c14fb055
parent0e8244322b7fc45fd11a1c45f70b6bacddf4986f
Merge branch 'pm-fixes'

* pm-fixes:
  cpufreq: s3c64xx: Rename index to driver_data
  intel_pstate: Fix type mismatch warning
  cpufreq / intel_pstate: Fix max_perf_pct on resume