diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 13:37:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 13:37:46 -0400 |
commit | c2ea122cd7c4a094be71641f3961796398035513 (patch) | |
tree | 7150db3e27a078c8a4183964a882bb15ba9f3f64 /net | |
parent | 17b2e9bf27d417bc186cc922b4d6d5eaa048f9d8 (diff) | |
parent | 66bb74888eb4bef4ba7c87c931ecb7ecca3a240c (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: consolidate documents
blktrace: pass the right pointer to kfree()
tracing/syscalls: use a dedicated file header
tracing: append a comma to INIT_FTRACE_GRAPH
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions