Merge branch 'pm-tools'

* pm-tools:
  cpupower: Fix build error in cpufreq-info