tree fae1b9baa31810dcf45aa2fe2ab38a8fdbbd1a43
parent 0260da162fa12c899b4377e71c243a631438c148
parent 6d5b43a67accf6793ed259f6534b4bd53b1e5696
author Linus Torvalds <torvalds@linux-foundation.org> 1227215481 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1227215481 -0800

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ftrace: fix dyn ftrace filter selection
  ftrace: make filtered functions effective on setting
  ftrace: fix set_ftrace_filter
  trace: introduce missing mutex_unlock()
  tracing: kernel/trace/trace.c: introduce missing kfree()