From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 6 Jan 2014 22:06:25 +0000 (+0100)
Subject: Merge branch 'pm-tools'
X-Git-Tag: next-20140107~67^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aac2277578ae78693d76475d8b35cb14676de173;p=karo-tx-linux.git

Merge branch 'pm-tools'

* pm-tools:
  PM / tools: analyze_suspend.py: suspend/resume performance optimization tool
  turbostat: Add option to report joules consumed per sample
  cpupower: Fix sscanf robustness in cpufreq-set
---

aac2277578ae78693d76475d8b35cb14676de173