tree 6b48024b35b2d166de592ab3238e80c3e763f46a
parent 4ca5ded2bdc09259ad89915bac2d218e72cda351
parent 03688970347bfea32823953a7ce5886d1713205f
author Linus Torvalds <torvalds@linux-foundation.org> 1265049781 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1265049781 -0800

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/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