From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Jul 2009 01:34:32 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.31-rc4~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0c50b541a4b147c5c2572ed051420238c47f57a;p=platform%2Fkernel%2Flinux-stable.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:
  tracing/function-profiler: do not free per cpu variable stat
  tracing/events: Move TRACE_SYSTEM outside of include guard
---

c0c50b541a4b147c5c2572ed051420238c47f57a