diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-26 01:58:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-26 01:58:05 +0100 |
commit | 509dceef6470442d8c7b8a43ec34125205840b3c (patch) | |
tree | b02f0a55bf98aa5e7d44698cc80e23a01a41edef /block | |
parent | x86, bts, ftrace: a BTS ftrace plug-in prototype (diff) | |
parent | tracing, tty: fix warnings caused by branch tracing and tty_kref_get() (diff) | |
download | linux-509dceef6470442d8c7b8a43ec34125205840b3c.tar.xz linux-509dceef6470442d8c7b8a43ec34125205840b3c.zip |
Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer' into tracing/core
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions