From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 May 2013 21:08:57 +0000 (-0700)
Subject: Merge tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.10-rc2~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c240a539df4e2d50f86e2f31813ff6b7334cd493;p=karo-tx-linux.git

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
---

c240a539df4e2d50f86e2f31813ff6b7334cd493