From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Feb 2010 18:43:01 +0000 (-0800)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.33-rc7~52
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=935cc9323ac33bb9b6cb853815e5c86f77e50607

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/documentation: Cover new frame pointer semantics
  tracing/documentation: Fix a typo in ftrace.txt
  ring-buffer: Check for end of page in iterator
  ring-buffer: Check if ring buffer iterator has stale data
  tracing: Prevent kernel oops with corrupted buffer
---

935cc9323ac33bb9b6cb853815e5c86f77e50607