]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:30:56 +0000 (15:30 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 14:30:56 +0000 (15:30 +0100)
* pm-tools:
  turbostat: Add option to report joules consumed per sample
  cpupower: Fix sscanf robustness in cpufreq-set


Trivial merge