From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 May 2009 16:15:41 +0000 (-0700)
Subject: Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.30-rc7~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0130b2d7010fe8e046b7a6c44911a1d3d0d16c96;p=platform%2Fupstream%2Fkernel-adaptation-pc.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:
  tracing: Append prompt in /debug/tracing/README file
  x86/function-graph: fix constraint for recording old return value
---

0130b2d7010fe8e046b7a6c44911a1d3d0d16c96