tree dd9705b6facd753cc0e239016c0f7618c74cba19
parent 2f73ccab5628b4f8e8f4b93fea8082dd31a87a10
parent 2464a609ded094204a3aed24823745ec58e3c879
author Linus Torvalds <torvalds@linux-foundation.org> 1216316230 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216316230 -0700

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