diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-04 19:02:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-04 19:02:53 +0100 |
| commit | 862b6f62bf0cd768910b087f6d051f420206c4d6 (patch) | |
| tree | f646e5246679ca851baf54e888c0d59b66ecf324 /kernel/trace/ftrace.c | |
| parent | 1ebdfa803dc5ced604ebadd26fcb8cdca8e09b85 (diff) | |
| parent | 3d56e331b6537671c66f1b510bed0f1e0331dfc8 (diff) | |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'kernel/trace/ftrace.c')
0 files changed, 0 insertions, 0 deletions