diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 10:11:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 10:11:37 +0100 |
| commit | d06bbd669539215405874d8fe32ab65105e6c4bb (patch) | |
| tree | 2567b00257b633fa13220fa515d4bad9749405db /kernel/trace/ftrace.c | |
| parent | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core (diff) | |
| parent | ring-buffer: clean up warn ons (diff) | |
| parent | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... (diff) | |
| download | linux-d06bbd669539215405874d8fe32ab65105e6c4bb.tar.xz linux-d06bbd669539215405874d8fe32ab65105e6c4bb.zip | |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts:
kernel/trace/ring_buffer.c