From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Oct 2008 18:44:09 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12-rc1~17433
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b54968f667585aa4b98a7225f4d4df63917703c;p=kernel%2Fkernel-generic.git

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
---

0b54968f667585aa4b98a7225f4d4df63917703c