Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Feb 2009 16:22:26 +0000 (08:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Feb 2009 16:22:26 +0000 (08:22 -0800)
commitb3f2caaaa82440af06b39c2c92e4fa8122d75465
tree62338ae23ff00ec98773a1a9d768a303740a4dfa
parent93431dd7afa908292753acccb68785efaa366f5b
parentf47a454db9129d2e61b224a40f4365cdd4f83042
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:
  tracing, x86: fix constraint for parent variable
  tracing, x86: fix fixup section to return to original code
  profiling: fix broken profiling regression