diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 10:16:17 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 10:17:48 +0100 |
commit | 8293dd6f86e759068ce918aa10ca9c5d6d711cd0 (patch) | |
tree | de366d69078bf2b98c6765fa4ec1cc652f3d3173 /kernel/trace/trace_workqueue.c | |
parent | 631595fbf4aeac260e664a8a002897e4db6a50dd (diff) | |
parent | 467c88fee51e2ae862e9485245687da0730e29aa (diff) | |
download | talos-op-linux-8293dd6f86e759068ce918aa10ca9c5d6d711cd0.tar.gz talos-op-linux-8293dd6f86e759068ce918aa10ca9c5d6d711cd0.zip |
Merge branch 'x86/core' into tracing/ftrace
Semantic merge:
kernel/trace/trace_functions_graph.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_workqueue.c')
0 files changed, 0 insertions, 0 deletions