| commit | c0c50b541a4b147c5c2572ed051420238c47f57a | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 15 Jul 2009 01:34:32 +0000 (14 18:34 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 15 Jul 2009 01:34:32 +0000 (14 18:34 -0700) | ||
| tree | 7500aefddead1009ed271c5b413f4b4fa89083a1 | treesnapshot (tar.gz zip) |
| parent | a376d446771710790f5f3425172b467bf8578e22 | commitdiff |
| parent | 6ab5d668b131d3c5416f6df1d3ca95b82d4fe8a2 | commitdiff |
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
* '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 | diff1 | diff2 | blobhistory |