aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-11 23:06:28 -0500
committerLen Brown <len.brown@intel.com>2011-01-11 23:06:28 -0500
commiteca0bdd326d2cf9127bbb6ac602bfbcbf169c10d (patch)
tree511cd500eed55693dca3086f7cb3d5072d203232 /tools
parent3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff)
parent103a8fea9b420d5faef43bb87332a28e2129816a (diff)
parentd5532ee7b40b4a64e605e543b0387694430ecb79 (diff)
downloadlinux-2.6.38-lt-ux500-eca0bdd326d2cf9127bbb6ac602bfbcbf169c10d.tar.gz
Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools