Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Dec 2009 17:53:21 +0000 (09:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Dec 2009 17:53:21 +0000 (09:53 -0800)
commit7a797cdcca2b3c0031e580203f18d6c9483aaec5
treee35526b99793c08fd76c9a41e969c1c070adcc51
parentbb2166c898adb5fe29bc450004926802d2a16035
parentc13d2f7c3231e873f30db92b96c8caa48f100f33
Merge branch 'tracing-fixes-for-linus' of git://git./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()