diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-29 14:27:58 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-29 14:27:58 +0100 |
commit | ce181ebeff398e7d1a9c6cb92eb035a6d2d07489 (patch) | |
tree | 01cb4853ed1c76c61eed4cc631bf38b3768060aa /block | |
parent | Merge branches 'tracing/blktrace', 'tracing/kmemtrace' and 'tracing/urgent' i... (diff) | |
parent | x86: ftrace - simplify wait_for_nmi (diff) | |
download | linux-ce181ebeff398e7d1a9c6cb92eb035a6d2d07489.tar.xz linux-ce181ebeff398e7d1a9c6cb92eb035a6d2d07489.zip |
Merge branch 'tracing/ftrace' into tracing/core
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions