tree 6cac4a7b00d76d56c299d77fc0b0e9d5809d9de5
parent 57ab3b08725163bfe385aaeea6837f9b1213af3d
parent 759d2a932b82009a7039ef5567e7dcba153ce123
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1447196481 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1447196481 +0100

Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-tools

Pull turbostat changes for v4.4 from Len Brown.

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: bugfix: print MAX_NON_TURBO_RATIO
  tools/power turbostat: simplify Bzy_MHz calculation