diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-27 15:25:22 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-27 15:25:22 +0200 |
| commit | a9062dcec3697db5bdf064311ad097c469fd87ec (patch) | |
| tree | bbb2ad3454d85ae38ea5efaa16418ce7650e3400 /fs/cifs/cifsencrypt.c | |
| parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
| parent | af71b980c0d20586cc331b617c47094a8ec7e1db (diff) | |
| download | linux-a9062dcec3697db5bdf064311ad097c469fd87ec.tar.gz linux-a9062dcec3697db5bdf064311ad097c469fd87ec.tar.bz2 linux-a9062dcec3697db5bdf064311ad097c469fd87ec.zip | |
Merge branch 'turbostat' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-tools
Pull turbostat updates for v4.3 from Len Brown.
* 'turbostat' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
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
Diffstat (limited to 'fs/cifs/cifsencrypt.c')
0 files changed, 0 insertions, 0 deletions