tree 1e3598cd0ddc32afa79fe2f368ede4617fae24da
parent ea876441052c2cebc27d9bd2a6f6b9bce6add408
parent 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab
author Linus Torvalds <torvalds@linux-foundation.org> 1255559091 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255559091 -0700

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/filters: Fix memory leak when setting a filter
  tracing: fix trace_vprintk call