Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq / OPP: Fix the order of arguments for kcalloc()