]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf3bc861f9b12009f1dd76817174f1cce6f898014
tree6d354dade8bfe96f00bbba55eaf3c87fc9593fe4
parentec783aa94712b09aefb6f6666adad564462b69b7
parentd52c8d0a82367a78d245d6eff3f4837ec0f67198
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