diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 18:53:21 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 18:53:21 +0100 |
commit | 7a797cdcca2b3c0031e580203f18d6c9483aaec5 (patch) | |
tree | e35526b99793c08fd76c9a41e969c1c070adcc51 /Makefile | |
parent | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | tracing: Fix trace_marker output (diff) | |
download | linux-7a797cdcca2b3c0031e580203f18d6c9483aaec5.tar.xz linux-7a797cdcca2b3c0031e580203f18d6c9483aaec5.zip |
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 'Makefile')
0 files changed, 0 insertions, 0 deletions