| commit | b983d0deb0e28f8880cdea79def575d96a27e603 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 17 08:53:14 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 17 08:53:14 2009 -0700 |
| tree | c1ae4f893647e2835e908717bf9073b8c7352a45 | |
| parent | ecc2e05e739c30870c8e4f252b63a0c4041f2724 [diff] | |
| parent | 04aef32d39cc4ef80087c0ce8ed113c6d64f1a6b [diff] |
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: tracing/function: Fix the return value of ftrace_trace_onoff_callback()