Linus Torvalds 6842d98de7 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux ... Pull powertool update from Len Brown: "This updates the tree w/ the latest version of turbostat, which reports temperature and - on SNB and later - Watts." Fix up semantic merge conflict as per Len. * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: tools: Allow tools to be installed in a user specified location tools/power: turbostat: make Makefile a bit more capable tools/power x86_energy_perf_policy: close /proc/stat in for_every_cpu() tools/power turbostat: v3.0: monitor Watts and Temperature tools/power turbostat: fix output buffering issue tools/power turbostat: prevent infinite loop on migration error path x86 power: define RAPL MSRs tools/power/x86/turbostat: share kernel MSR #defines		2012-12-18 12:34:29 -08:00
..
firewire	tools/firewire: nosy-dump: check for allocation failure	2012-12-02 20:10:18 +01:00
hv	tools/hv: Fix string types	2012-11-15 15:39:59 -08:00
include/tools	tools/include: Add byteshift headers for endian access	2012-02-28 10:22:51 -08:00
lguest	lguest: fix occasional crash in example launcher.	2012-10-04 12:12:59 +09:30
lib/traceevent	tools lib traceevent: Use 'const' in variables pointing to const strings	2012-11-09 17:42:47 -03:00
nfsd	NFSD: Added fault injection script	2011-11-07 21:10:47 -05:00
perf	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
power	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-12-18 12:34:29 -08:00
scripts	tools: Pass the target in descend	2012-11-19 22:10:36 +00:00
testing	tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test	2012-12-17 17:15:27 -08:00
usb	tools/usb: remove last USBFS user	2012-09-10 11:10:37 -07:00
virtio	tools:virtio: fix compilation warning	2012-12-06 17:09:17 +02:00
vm	UAPI: fix tools/vm/page-types.c	2012-10-25 14:37:53 -07:00
Makefile	tools: Define a Makefile function to do subdir processing	2012-11-19 22:10:14 +00:00