| commit | 09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 11 10:51:50 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 11 10:51:50 2008 -0800 |
| tree | 9859b9ec3b5979af6b177155ef847f97fba19a6a | |
| parent | 04ca2c17e3fae2d3f73aa5ad533242d556cadf5a [diff] | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 [diff] |
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: ring-buffer: prevent infinite looping on time stamping ftrace: disable tracing on resize ftrace: fix breakage in bin_fmt results ftrace: ftrace.txt version update ftrace: update txt document