diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-02 09:20:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-02 09:20:29 +0100 |
| commit | 74bf3cabc306f31ddd02f2c1b0540a6cfcacc593 (patch) | |
| tree | c9f2997a7266cc5d8c5b61e964d8e014f274f5d3 /arch/x86 | |
| parent | Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/function-graph-... (diff) | |
| parent | ftrace: prevent recursion (diff) | |
| download | linux-74bf3cabc306f31ddd02f2c1b0540a6cfcacc593.tar.xz linux-74bf3cabc306f31ddd02f2c1b0540a6cfcacc593.zip | |
Merge branch 'tracing/urgent' into tracing/core
Conflicts:
kernel/trace/ring_buffer.c
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions