From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Nov 2009 17:45:44 +0000 (-0800)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.32-rc6~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a;p=nvme.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:
  tracing: Remove cpu arg from the rb_time_stamp() function
  tracing: Fix comment typo and documentation example
  tracing: Fix trace_seq_printf() return value
  tracing: Update *ppos instead of filp->f_pos
---

a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a