summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2014-04-04 21:05:22 +0400
committerLen Brown <len.brown@intel.com>2014-04-04 21:05:22 +0400
commit23a299cd93781a190cdca0d7d16034837b7dfd86 (patch)
tree2d53995f30b311038e8273e081804e5c734db2fa /tools
parent455c6fdbd219161bd09b1165f11699d6d73de11c (diff)
parent4e8e863fed2e82278d29c6357de8251adb73acb9 (diff)
parent0138d8f0755b5b28d0acdb0a758bcfcaf441fc58 (diff)
downloadlinux-23a299cd93781a190cdca0d7d16034837b7dfd86.tar.xz
Merge branches 'turbostat' and 'intel_idle' into release