From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Oct 2009 19:03:43 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0f26ec69f0c4071a8dfa3c2ac8e180a79355f81a;p=openwrt%2Fstaging%2Fblogic.git

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:
  kmemtrace: Fix up tracer registration
  tracing: Fix infinite recursion in ftrace_update_pid_func()
---

0f26ec69f0c4071a8dfa3c2ac8e180a79355f81a