diff options
| author | Linus Torvalds | 2012-12-18 21:28:39 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-12-18 21:28:39 +0100 |
| commit | 758338e960ebe8ac3bef7ae11ff830bc2f9c655c (patch) | |
| tree | dbaea6140ada681baa462a2818095bcea0160108 /arch/x86/kernel/cpu/perf_event_intel.c | |
| parent | Merge tag 'stable/for-linus-3.8-rc0-bugfix-tag' of git://git.kernel.org/pub/s... (diff) | |
| parent | tracing: Remove unnecessary WARN_ONCE's from tracing_buffers_splice_read (diff) | |
| download | kernel-qcow2-linux-758338e960ebe8ac3bef7ae11ff830bc2f9c655c.tar.gz kernel-qcow2-linux-758338e960ebe8ac3bef7ae11ff830bc2f9c655c.tar.xz kernel-qcow2-linux-758338e960ebe8ac3bef7ae11ff830bc2f9c655c.zip | |
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull minor tracing updates and fixes from Steven Rostedt:
"It seems that one of my old pull requests have slipped through.
The changes are contained to just the files that I maintain, and are
changes from others that I told I would get into this merge window.
They have already been in linux-next for several weeks, and should be
well tested."
* 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Remove unnecessary WARN_ONCE's from tracing_buffers_splice_read
tracing: Remove unneeded checks from the stack tracer
tracing: Add a resize function to make one buffer equivalent to another buffer
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_intel.c')
0 files changed, 0 insertions, 0 deletions