]> 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, 17 Jul 2008 17:37:10 +0000 (10:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Jul 2008 17:37:10 +0000 (10:37 -0700)
commit8084e67de213144e996d14b16ea8c46d837b6652
treedd9705b6facd753cc0e239016c0f7618c74cba19
parent9fb27d1994ff277b3b19fd4f0695bb515169d1a3
parent7dd06599bf5216235fbe503886d1f60a932e9eab
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