| commit | c0c50b541a4b147c5c2572ed051420238c47f57a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 14 18:34:32 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 14 18:34:32 2009 -0700 |
| tree | 7500aefddead1009ed271c5b413f4b4fa89083a1 | |
| parent | a376d446771710790f5f3425172b467bf8578e22 [diff] | |
| parent | 6ab5d668b131d3c5416f6df1d3ca95b82d4fe8a2 [diff] |
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: tracing/function-profiler: do not free per cpu variable stat tracing/events: Move TRACE_SYSTEM outside of include guard