Linus Torvalds 87af5e5c22 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		2014-02-02 11:28:48 -08:00
..
acpi	ACPICA: acpidump: Cleanup tools/power/acpi makefiles.	2014-01-16 01:50:31 +01:00
cpupower	Merge branches 'acpi-tools' and 'pm-tools'	2014-01-17 01:59:48 +01:00
x86	tools/power turbostat: introduce -s to dump counters	2014-02-01 15:24:28 -05:00