diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 09:53:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 09:53:21 -0800 |
| commit | 7a797cdcca2b3c0031e580203f18d6c9483aaec5 (patch) | |
| tree | e35526b99793c08fd76c9a41e969c1c070adcc51 /net | |
| parent | bb2166c898adb5fe29bc450004926802d2a16035 (diff) | |
| parent | c13d2f7c3231e873f30db92b96c8caa48f100f33 (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:
tracing: Fix trace_marker output
tracing: Fix event format export
tracing: Fix return value of tracing_stats_read()
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions