aboutsummaryrefslogtreecommitdiff
path: root/tools/power/x86
diff options
context:
space:
mode:
authorGravatar Len Brown <len.brown@intel.com> 2011-11-06 22:14:50 -0500
committerGravatar Len Brown <len.brown@intel.com> 2011-11-06 22:14:50 -0500
commitefb90582c575084723cc14302c1300cb26c7e01f (patch)
tree25af70a2c40e7e404215acd9aadfa42e71e716ae /tools/power/x86
parentMerge branches 'atomic-io', 'lockdep', 'misc', 'pm-profile' and 'pnp-cleanup'... (diff)
parentcpuidle: Single/Global registration of idle states (diff)
parentmrst pmu: update comment (diff)
parenttools/power turbostat: less verbose debugging (diff)
downloadlinux-efb90582c575084723cc14302c1300cb26c7e01f.tar.gz
linux-efb90582c575084723cc14302c1300cb26c7e01f.tar.bz2
linux-efb90582c575084723cc14302c1300cb26c7e01f.zip
Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next