diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 12:28:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 12:28:39 -0800 |
| commit | 758338e960ebe8ac3bef7ae11ff830bc2f9c655c (patch) | |
| tree | dbaea6140ada681baa462a2818095bcea0160108 /kernel/ksysfs.c | |
| parent | 224394ad75711042c6d362c9dbc9874b476edbc0 (diff) | |
| parent | bf3071f5a054db9e5bab873355d27a7330ce5187 (diff) | |
| download | op-kernel-dev-758338e960ebe8ac3bef7ae11ff830bc2f9c655c.zip op-kernel-dev-758338e960ebe8ac3bef7ae11ff830bc2f9c655c.tar.gz | |
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 'kernel/ksysfs.c')
0 files changed, 0 insertions, 0 deletions
