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 /arch/cris | |
parent | doc: add trace_buf_size description to kernel-parameters.txt (diff) | |
parent | Merge branches 'x86/apic', 'x86/asm', 'x86/fixmap', 'x86/memtest', 'x86/mm', ... (diff) | |
download | linux-8293dd6f86e759068ce918aa10ca9c5d6d711cd0.tar.xz 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 'arch/cris')
0 files changed, 0 insertions, 0 deletions