tree 51eca731a6b58b9868e23977e4b337921e6805dc
parent b5a7c9a0b3c5de22e1762120063daae9f91d5197
parent e16852cfc5580b88cb327413ab8c89375f380592
author Linus Torvalds <torvalds@linux-foundation.org> 1249425111 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249425111 -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: Fix missing function_graph events when we splice_read from trace_pipe
  tracing: Fix invalid function_graph entry
  trace: stop tracer in oops_enter()
  ftrace: Only update $offset when we update $ref_func
  ftrace: Fix the conditional that updates $ref_func
  tracing: only truncate ftrace files when O_TRUNC is set
  tracing: show proper address for trace-printk format