diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-18 12:51:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 12:51:05 +0100 |
commit | 40874491f9e9a4cb08eaf663dbe018bf5671975a (patch) | |
tree | 0c212477aa6cb994a7c6702b5076748f95a1a118 /kernel/trace | |
parent | d680fe44775ed17a80035462d9898f5e77bfd7dd (diff) | |
parent | d072c25f531c6513994960401d2c7f059434c0d2 (diff) | |
download | linux-40874491f9e9a4cb08eaf663dbe018bf5671975a.tar.gz linux-40874491f9e9a4cb08eaf663dbe018bf5671975a.tar.bz2 linux-40874491f9e9a4cb08eaf663dbe018bf5671975a.zip |
Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions