Merge tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 May 2013 21:08:57 +0000 (14:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 May 2013 21:08:57 +0000 (14:08 -0700)
commitc240a539df4e2d50f86e2f31813ff6b7334cd493
tree3a2f654b33fcfc9ee5a9c881e85f70c97f858336
parentae3b29e67ca361f0876dad6be2061699de95d126
parentb62fdd97fcae17e483b005bafd13fadbd9840672
Merge tag 'trace-fixes-v3.10-rc1' of git://git./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