diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-16 16:38:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-16 16:38:57 -0700 |
commit | 2a83dc7e37045ecf6791bb98e7b91c3f761e5efe (patch) | |
tree | 4a820de1fbcd2f1290afeb7f2e06a98c18410e87 /drivers/platform/x86/dell-wmi.c | |
parent | 17cf7db27b3af29ebbc14466785236878aad98eb (diff) | |
parent | ad466db5b0c302e85ad96c42a43194c234cbd862 (diff) | |
download | op-kernel-dev-2a83dc7e37045ecf6791bb98e7b91c3f761e5efe.zip op-kernel-dev-2a83dc7e37045ecf6791bb98e7b91c3f761e5efe.tar.gz |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Tooling fixes, plus a simple hardware-enablement patch for the Intel
RAPL PMU (energy use measurement) on Haswell CPUs, which I hope is
still fine at this stage"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools: Instead of redirecting flex output, use -o
perf tools: Fix double free in perf test 21 (code-reading.c)
perf stat: Initialize statistics correctly
perf bench: Set more defaults in the 'numa' suite
perf bench: Fix segfault at the end of an 'all' execution
perf bench: Update manpage to mention numa and futex
perf probe: Use dwarf_getcfi_elf() instead of dwarf_getcfi()
perf probe: Fix to handle errors in line_range searching
perf probe: Fix --line option behavior
perf tools: Pick up libdw without explicit LIBDW_DIR
MAINTAINERS: Change e-mail to kernel.org one
perf callchains: Disable unwind libraries when libelf isn't found
tools lib traceevent: Do not call warning() directly
tools lib traceevent: Print event name when show warning if possible
perf top: Fix documentation of invalid -s option
perf/x86: Enable DRAM RAPL support on Intel Haswell
Diffstat (limited to 'drivers/platform/x86/dell-wmi.c')
0 files changed, 0 insertions, 0 deletions