Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Oct 2008 18:44:09 +0000 (11:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Oct 2008 18:44:09 +0000 (11:44 -0700)
commit0b54968f667585aa4b98a7225f4d4df63917703c
tree6d354dade8bfe96f00bbba55eaf3c87fc9593fe4
parenteffdb9492de01a51f8123e62e87e3330688f9bf1
parentf3384b28a05624783b53836ccfed95ecde66a7ad
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 trace_nop config select
  ftrace: perform an initialization for ftrace to enable it