| commit | e345fe1ada6f91bf703ca080168745ef18b2f037 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 14 Oct 2009 22:24:51 +0000 (14 15:24 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 14 Oct 2009 22:24:51 +0000 (14 15:24 -0700) | ||
| tree | 1e3598cd0ddc32afa79fe2f368ede4617fae24da | treesnapshot (tar.gz zip) |
| parent | ea876441052c2cebc27d9bd2a6f6b9bce6add408 | commitdiff |
| parent | 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab | 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/filters: Fix memory leak when setting a filter
tracing: fix trace_vprintk call
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing/filters: Fix memory leak when setting a filter
tracing: fix trace_vprintk call