Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 21:05:31 +0000 (13:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 21:05:31 +0000 (13:05 -0800)
commit7bbc67fbf60b698b43692fc6ea16c526bf1c5e26
tree35b4c929ecea3d3fc54f221501a25c136bd6b1a6
parent66a45cc4cc1c1f7d1ccae4d0fee261eab5560682
parent4f5a7f40ddbae98569acbb99118a98570315579c
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