]> 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>
Mon, 5 Oct 2009 19:03:43 +0000 (12:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Oct 2009 19:03:43 +0000 (12:03 -0700)
commit6e591745b09b29d0263b4c290a3c94325955c377
tree3104b99ef5604ec9e17d6cd3ac2eadc80af2e9d8
parente9590a0de40a8929a1f3d78198db4239fe6485a9
parentb98195d29774a8ec79fcc60a16180219e019e611
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:
  kmemtrace: Fix up tracer registration
  tracing: Fix infinite recursion in ftrace_update_pid_func()