]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commit0f26ec69f0c4071a8dfa3c2ac8e180a79355f81a
tree3104b99ef5604ec9e17d6cd3ac2eadc80af2e9d8
parent46302b46e5cf9e23859360e38c540be6e3465c6b
parentf9ac5a69edee0ee7e06a05727226e3f275306c8d
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()