Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commitc0c50b541a4b147c5c2572ed051420238c47f57a
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 01:34:32 +0000 (14 18:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 01:34:32 +0000 (14 18:34 -0700)
tree7500aefddead1009ed271c5b413f4b4fa89083a1
parenta376d446771710790f5f3425172b467bf8578e22
parent6ab5d668b131d3c5416f6df1d3ca95b82d4fe8a2
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
include/trace/events/ext4.h