| commit | ae216dd239765afd592f65d94d8430244cf77ed1 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Feb 10 13:58:28 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Feb 10 13:58:28 2009 +0100 |
| tree | a8e203cd9260be48d07e1484f87023d7d3dbae64 | |
| parent | f9915bfef3c64ea0b0b960dd1b999b584a7ef460 [diff] | |
| parent | 34cd4998d38f9bd04f34b78a7cb0c7f1bee00bd9 [diff] |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace