diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 17:45:42 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 17:45:42 +0100 |
commit | 546e5354a6e4ec760ac03ef1148e9a4762abb5f5 (patch) | |
tree | ed9a867384f400f1270786e2cafa0d107ace6b75 /kernel/trace/trace_output.c | |
parent | tracing, power-trace: make it build even if the power-tracer is turned off (diff) | |
parent | vsprintf: unify the format decoding layer for its 3 users (diff) | |
download | linux-546e5354a6e4ec760ac03ef1148e9a4762abb5f5.tar.xz linux-546e5354a6e4ec760ac03ef1148e9a4762abb5f5.zip |
Merge branch 'core/printk' into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_output.c')
0 files changed, 0 insertions, 0 deletions