From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Jun 2009 18:05:04 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-5.2.0-15.16~28834
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9b71272b6ad4966481d73e6abf3ae4bbc3bdabd5;p=mirror_ubuntu-eoan-kernel.git

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()
---

9b71272b6ad4966481d73e6abf3ae4bbc3bdabd5