From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 Nov 2008 21:05:31 +0000 (-0800)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7bbc67fbf60b698b43692fc6ea16c526bf1c5e26;p=openwrt%2Fstaging%2Fblogic.git

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:
  ftrace: prevent recursion
  tracing, doc: update mmiotrace documentation
  x86, mmiotrace: fix buffer overrun detection
  function tracing: fix wrong position computing of stack_trace
---

7bbc67fbf60b698b43692fc6ea16c526bf1c5e26