tree 7150db3e27a078c8a4183964a882bb15ba9f3f64
parent 17b2e9bf27d417bc186cc922b4d6d5eaa048f9d8
parent 66bb74888eb4bef4ba7c87c931ecb7ecca3a240c
author Linus Torvalds <torvalds@linux-foundation.org> 1239298666 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239298666 -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: consolidate documents
  blktrace: pass the right pointer to kfree()
  tracing/syscalls: use a dedicated file header
  tracing: append a comma to INIT_FTRACE_GRAPH