tree de212f5ffaa6b1a11c17fe5780f931dedd0c865f
parent ec6a8679fa8ce977c8b7f86238455b494699de74
parent 636eacee3b0c76915151db37203cc624becb6d7b
author Linus Torvalds <torvalds@linux-foundation.org> 1248997618 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1248997618 -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/stat: Fix seqfile memory leak
  function-graph: Fix seqfile memory leak
  trace_stack: Fix seqfile memory leak
  profile: Suppress warning about large allocations when profile=1 is specified