tree 511cd500eed55693dca3086f7cb3d5072d203232
parent 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
parent 103a8fea9b420d5faef43bb87332a28e2129816a
parent d5532ee7b40b4a64e605e543b0387694430ecb79
author Len Brown <len.brown@intel.com> 1294805188 -0500
committer Len Brown <len.brown@intel.com> 1294805188 -0500

Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools