summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 05:06:28 +0100
committerLen Brown <len.brown@intel.com>2011-01-12 05:06:28 +0100
commiteca0bdd326d2cf9127bbb6ac602bfbcbf169c10d (patch)
tree511cd500eed55693dca3086f7cb3d5072d203232 /tools
parentLinux 2.6.37 (diff)
parenttools: create power/x86/turbostat (diff)
parenttools: create power/x86/x86_energy_perf_policy (diff)
downloadlinux-eca0bdd326d2cf9127bbb6ac602bfbcbf169c10d.tar.xz
linux-eca0bdd326d2cf9127bbb6ac602bfbcbf169c10d.zip
Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools