From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Dec 2009 17:53:21 +0000 (-0800)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.33-rc1~401
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7a797cdcca2b3c0031e580203f18d6c9483aaec5;p=~emulex%2Finfiniband.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: Fix trace_marker output
  tracing: Fix event format export
  tracing: Fix return value of tracing_stats_read()
---

7a797cdcca2b3c0031e580203f18d6c9483aaec5