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)
commit1133bfa6dcf034639486982629d29472737d5e96
tree8ab074d3dc96defa0e4b2032ecfc9cf38b86caef
parentd8d3b4711297e101bbad826474013edbe342c333
parentcffe4e0e7413eb29fb8bd035c8b12b33a4b8522a
Merge branch 'pm-cpufreq-ondemand' into pm-cpufreq

* pm-cpufreq:
  cpufreq: Remove unused function __cpufreq_driver_getavg()
  cpufreq: Remove unused APERF/MPERF support
  cpufreq: ondemand: Change the calculation of target frequency
drivers/cpufreq/cpufreq.c