tree 39ee39ee45333b9eadb0c1183d9e88f86be59983
parent 61abfd2df8aa43a137ae58446dd0638a2385586e
parent 0296e4254f3318e0dcad9706fa1daf8e5addc1e9
author Linus Torvalds <torvalds@linux-foundation.org> 1246212304 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1246212304 -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:
  ftrace: Fix the output of profile
  ring-buffer: Make it generally available
  ftrace: Remove duplicate newline
  tracing: Fix trace_buf_size boot option
  ftrace: Fix t_hash_start()
  ftrace: Don't manipulate @pos in t_start()
  ftrace: Don't increment @pos in g_start()
  tracing: Reset iterator in t_start()
  trace_stat: Don't increment @pos in seq start()
  tracing_bprintk: Don't increment @pos in t_start()
  tracing/events: Don't increment @pos in s_start()