From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Apr 2014 17:16:43 +0000 (-0700)
Subject: Merge tag 'trace-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: submit/tizen/20160607.132125~4720
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d77879bfd5ab0bcd9eb33180224b27fda61a7cd;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'trace-fixes-v3.15-rc1' of git://git./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
---

7d77879bfd5ab0bcd9eb33180224b27fda61a7cd