Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 04:06:28 +0000 (23:06 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 04:06:28 +0000 (23:06 -0500)

Trivial merge