diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-16 01:28:46 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-16 01:28:46 -0500 |
| commit | c91add5fa68ea9b1f2923b3788c5dae0e60e1f6b (patch) | |
| tree | 95e94cf87c9310d33afcf7139fe2a9ac78494f74 /kernel/trace/ftrace.c | |
| parent | d1aaf8cf8afe70a8c2235a565885291fe290c57c (diff) | |
| parent | b3535c6390f27d04273e4eee0bc687f171fbf5f4 (diff) | |
| parent | ee51a1de7e3837577412be269e0100038068e691 (diff) | |
Merge branches 'tracing/fastboot', 'tracing/ftrace' and 'tracing/urgent' into tracing/core