diff options
author | 2014-02-02 11:28:48 -0800 | |
---|---|---|
committer | 2014-02-02 11:28:48 -0800 | |
commit | 87af5e5c22568201dfbda5cac9c76e96982adc9c (patch) | |
tree | a47312617500e2042a252acc36e71d0a63a24abc /drivers/clocksource/qcom-timer.c | |
parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
parent | tools/power turbostat: introduce -s to dump counters (diff) | |
download | linux-dev-87af5e5c22568201dfbda5cac9c76e96982adc9c.tar.xz linux-dev-87af5e5c22568201dfbda5cac9c76e96982adc9c.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull turbostat updates from Len Brown.
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: introduce -s to dump counters
tools/power turbostat: remove unused command line option
turbostat: Add option to report joules consumed per sample
turbostat: run on HSX
turbostat: Add a .gitignore to ignore the compiled turbostat binary
turbostat: Clean up error handling; disambiguate error messages; use err and errx
turbostat: Factor out common function to open file and exit on failure
turbostat: Add a helper to parse a single int out of a file
turbostat: Check return value of fscanf
turbostat: Use GCC's CPUID functions to support PIC
turbostat: Don't attempt to printf an off_t with %zx
turbostat: Don't put unprocessed uapi headers in the include path
Diffstat (limited to 'drivers/clocksource/qcom-timer.c')
0 files changed, 0 insertions, 0 deletions