| commit | d9f67dbc0f55e67dd18fc18fa05a9d5d2bd52914 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Mon Nov 16 22:57:02 2015 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Mon Nov 16 22:57:02 2015 +0100 |
| tree | 6121f08535ca972d3f47ac11abdc9414744a9e08 | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec [diff] | |
| parent | 5369a21e3f26ef9d2bf6ea1b322d6899a4ed08e0 [diff] |
Merge branch 'pm-tools' * pm-tools: x86: remove unused definition of MSR_NHM_PLATFORM_INFO tools/power turbostat: use new name for MSR_PLATFORM_INFO