]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2f73cca 2464a60)
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)
commitbdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f
treedd9705b6facd753cc0e239016c0f7618c74cba19tree | snapshot
parent2f73ccab5628b4f8e8f4b93fea8082dd31a87a10commit | diff
parent2464a609ded094204a3aed24823745ec58e3c879commit | diff
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
Linux 2.6 source tree