diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-04 20:45:41 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-04 20:45:41 +0100 |
commit | ce70a0b472e06feae3a580ecb3fbef1e1e020a9b (patch) | |
tree | 46e8a2ef0c91fae86a735ee08add6cd6519ee74f | |
parent | blktrace: fix coding style in recent patches (diff) | |
parent | trace: let boot trace be chosen by command line (diff) | |
parent | ftrace: do_each_pid_task() needs rcu lock (diff) | |
download | linux-ce70a0b472e06feae3a580ecb3fbef1e1e020a9b.tar.xz linux-ce70a0b472e06feae3a580ecb3fbef1e1e020a9b.zip |
Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/urgent' and 'linus' into tracing/core