diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-10-01 22:30:47 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-10-01 22:30:47 +0200 |
| commit | eb6d1c287ae1f7221248d5be26a5b1560073c09e (patch) | |
| tree | 5cf86434abe6802f9749c1cd22c95ab5c592fea4 | |
| parent | 01351eb23c5047895c14c91a898546c289a3c35c (diff) | |
| parent | e9a7bed40cbc09eee4b7a15509726a44565805be (diff) | |
| parent | e1a2d49cd5ef551c51be95cc037033e9e582b0cd (diff) | |
| parent | a9062dcec3697db5bdf064311ad097c469fd87ec (diff) | |
| download | linux-eb6d1c287ae1f7221248d5be26a5b1560073c09e.tar.gz linux-eb6d1c287ae1f7221248d5be26a5b1560073c09e.tar.bz2 linux-eb6d1c287ae1f7221248d5be26a5b1560073c09e.zip | |
Merge branches 'pm-cpuidle', 'pm-opp' and 'pm-tools'
* pm-cpuidle:
intel_idle: Skylake Client Support - updated
* pm-opp:
PM / OPP: Fix typo modifcation -> modification
PM / OPP: of_property_count_u32_elems() can return errors
* pm-tools:
tools/power turbosat: update version number
tools/power turbostat: SKL: Adjust for TSC difference from base frequency
tools/power turbostat: KNL workaround for %Busy and Avg_MHz
tools/power turbostat: IVB Xeon: fix --debug regression