From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Jul 2008 17:37:10 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.27-rc1~1039
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f;p=thirdparty%2Fkernel%2Flinux.git

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: do not trace library functions
  ftrace: do not trace scheduler functions
  ftrace: fix lockup with MAXSMP
  ftrace: fix merge buglet
---

bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f