diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 10:16:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 10:16:43 -0700 |
| commit | 7d77879bfd5ab0bcd9eb33180224b27fda61a7cd (patch) | |
| tree | e43d36e1405b4edf3198c85eec9f6eac1055ec91 /Documentation/devicetree/bindings/rng/brcm,bcm2835.txt | |
| parent | 87a54cae0ba094de2ddb7e5f429fd32b965a2fbf (diff) | |
| parent | 6ea6215fe394e320468589d9bba464a48f6d823a (diff) | |
Merge tag 'trace-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"This contains two fixes.
The first is to remove a duplication of creating debugfs files that
already exist and causes an error report to be printed due to the
failure of the second creation.
The second is a memory leak fix that was introduced in 3.14"
* tag 'trace-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/uprobes: Fix uprobe_cpu_buffer memory leak
tracing: Do not try to recreated toplevel set_ftrace_* files
Diffstat (limited to 'Documentation/devicetree/bindings/rng/brcm,bcm2835.txt')
0 files changed, 0 insertions, 0 deletions