Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jul 2009 15:53:14 +0000 (08:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Jul 2009 15:53:14 +0000 (08:53 -0700)
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tracing/function: Fix the return value of ftrace_trace_onoff_callback()


Trivial merge