diff options
author | 2009-02-11 10:03:11 +0100 | |
---|---|---|
committer | 2009-02-11 10:03:11 +0100 | |
commit | d524e03207591a6de7e6b5069aabc778e3f0f5f8 (patch) | |
tree | c98f206e8df11f8ecbdd74dba79c29d1f90dea5a /kernel/trace/ring_buffer.c | |
parent | Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace (diff) | |
parent | Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent (diff) | |
download | linux-dev-d524e03207591a6de7e6b5069aabc778e3f0f5f8.tar.xz linux-dev-d524e03207591a6de7e6b5069aabc778e3f0f5f8.zip |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Diffstat (limited to 'kernel/trace/ring_buffer.c')
0 files changed, 0 insertions, 0 deletions