diff options
| author | Linus Torvalds | 2013-05-15 23:08:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-05-15 23:08:57 +0200 |
| commit | c240a539df4e2d50f86e2f31813ff6b7334cd493 (patch) | |
| tree | 3a2f654b33fcfc9ee5a9c881e85f70c97f858336 /drivers/thermal/Makefile | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | tracing/kprobes: Make print_*probe_event static (diff) | |
| download | kernel-qcow2-linux-c240a539df4e2d50f86e2f31813ff6b7334cd493.tar.gz kernel-qcow2-linux-c240a539df4e2d50f86e2f31813ff6b7334cd493.tar.xz kernel-qcow2-linux-c240a539df4e2d50f86e2f31813ff6b7334cd493.zip | |
Merge tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"This includes a fix to a memory leak when adding filters to traces.
Also, Masami Hiramatsu fixed up some minor bugs that were discovered
by sparse."
* tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/kprobes: Make print_*probe_event static
tracing/kprobes: Fix a sparse warning for incorrect type in assignment
tracing/kprobes: Use rcu_dereference_raw for tp->files
tracing: Fix leaks of filter preds
Diffstat (limited to 'drivers/thermal/Makefile')
0 files changed, 0 insertions, 0 deletions