| commit | 327019b01e068d66dada6a8b2571180ab3674d20 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Mar 18 06:59:56 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Mar 18 06:59:56 2009 +0100 |
| tree | c81354a509d6962f6878145fcf3cdbe50a000a89 | |
| parent | 03418c7efaa429dc7647ac93e3862e3fe1816873 [diff] | |
| parent | 62524d55e5b9ffe36e3bf3dd7a594114f150b449 [diff] |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace