diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-02 11:28:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-02 11:28:48 -0800 |
| commit | 87af5e5c22568201dfbda5cac9c76e96982adc9c (patch) | |
| tree | a47312617500e2042a252acc36e71d0a63a24abc /mm/slab.c | |
| parent | e4c0da21650185cb7df6685c5437dad0e9f77028 (diff) | |
| parent | 3b4d5c7fec0a0b1bbf56d3b8337770fa30f4d1ad (diff) | |
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 'mm/slab.c')
0 files changed, 0 insertions, 0 deletions