From: Len Brown <len.brown@intel.com>
Date: Wed, 12 Jan 2011 04:06:28 +0000 (-0500)
Subject: Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~4837^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=eca0bdd326d2cf9127bbb6ac602bfbcbf169c10d;p=mirror_ubuntu-zesty-kernel.git

Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools
---

eca0bdd326d2cf9127bbb6ac602bfbcbf169c10d