Merge branch 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Jan 2013 22:10:47 +0000 (23:10 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Jan 2013 22:10:47 +0000 (23:10 +0100)
* pm-cpufreq:
  cpufreq / governor: Fix problem with cpufreq_ondemand or cpufreq_conservative
  cpufreq / Longhaul: Disable driver by default
  cpufreq / stats: fix race between stats allocation and first usage


Trivial merge