| commit | e2b8b2808538a91444e78c7db5a30519cadd09b2 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Mar 10 22:55:31 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Mar 10 22:55:31 2009 +0100 |
| tree | 60c45581817db746bd61670f5c95b19c2661daa0 | |
| parent | 4dd163a0512eb91bbcf4e66d2f65b8e4042561b3 [diff] | |
| parent | ef18012b248b47ec9a12c3a83ca5e99782d39c5d [diff] |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace