From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Nov 2008 18:51:50 +0000 (-0800)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.28-rc5~80
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2;p=linux-2.6-omap-h63xx.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:
  ring-buffer: prevent infinite looping on time stamping
  ftrace: disable tracing on resize
  ftrace: fix breakage in bin_fmt results
  ftrace: ftrace.txt version update
  ftrace: update txt document
---

09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2