Merge branch 'pm-cpufreq-ondemand' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 7 Aug 2013 21:11:43 +0000 (23:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 7 Aug 2013 21:11:43 +0000 (23:11 +0200)
* pm-cpufreq:
  cpufreq: Remove unused function __cpufreq_driver_getavg()
  cpufreq: Remove unused APERF/MPERF support
  cpufreq: ondemand: Change the calculation of target frequency

1  2 
drivers/cpufreq/cpufreq.c

Simple merge