| commit | 0130b2d7010fe8e046b7a6c44911a1d3d0d16c96 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 18 May 2009 16:15:41 +0000 (18 09:15 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 18 May 2009 16:15:41 +0000 (18 09:15 -0700) | ||
| tree | e4fb22c311a2ca8da64528538646d1e2579f4447 | treesnapshot (tar.gz zip) |
| parent | 80193195f87ebca6d7417516d6edeb3969631c15 | commitdiff |
| parent | 88fc86c283d9c3854e67e4155808027bc2519eb6 | commitdiff |
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
* '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