| commit | c478f8786973d6d7552c652ddad3f6fd86b5af28 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sun Feb 22 18:12:01 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Feb 22 18:12:01 2009 +0100 |
| tree | 39967f4bb9a35d626584bd46f1acd916c6b5278d | |
| parent | 843adf2379c18ed9a1b7493ee208bfd5512732e0 [diff] | |
| parent | 4377245aa93b65b6597e4b7bb460fb9abc48b56b [diff] |
Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace Conflicts: include/linux/ftrace.h kernel/trace/ftrace.c