| commit | 0b54968f667585aa4b98a7225f4d4df63917703c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 30 11:44:09 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 30 11:44:09 2008 -0700 |
| tree | 6d354dade8bfe96f00bbba55eaf3c87fc9593fe4 | |
| parent | effdb9492de01a51f8123e62e87e3330688f9bf1 [diff] | |
| parent | f3384b28a05624783b53836ccfed95ecde66a7ad [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: ftrace: fix trace_nop config select ftrace: perform an initialization for ftrace to enable it