diff options
| author | Ingo Molnar <[email protected]> | 2008-12-19 08:42:40 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-12-19 08:42:40 +0000 |
| commit | 30cd324e9787ccc9a5ede59742d5409857550692 (patch) | |
| tree | e53027e0283119de0ef4c3a431b1d20cd43003fb /net/unix/af_unix.c | |
| parent | tracing: fix warnings in kernel/trace/trace_sched_switch.c (diff) | |
| parent | tracing/ring-buffer: remove unused ring_buffer size (diff) | |
| parent | trace: fix task state printout (diff) | |
| download | kernel-30cd324e9787ccc9a5ede59742d5409857550692.tar.gz kernel-30cd324e9787ccc9a5ede59742d5409857550692.zip | |
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core
Conflicts:
include/linux/ftrace.h