Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2008 21:11:21 +0000 (13:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2008 21:11:21 +0000 (13:11 -0800)
commit95763dd52b4b9b3578d3428001ece1e11b016ffc
treefae1b9baa31810dcf45aa2fe2ab38a8fdbbd1a43
parent0260da162fa12c899b4377e71c243a631438c148
parent6d5b43a67accf6793ed259f6534b4bd53b1e5696
Merge branch 'tracing-fixes-for-linus' of git://git./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()