| commit | 918143e8b7d6153d7a83a3f854323407939f4a7e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jun 05 16:50:29 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jun 05 16:50:29 2009 +0200 |
| tree | 34c0b1434516d146fc3811a6d071b052dd59342b | |
| parent | 64edbc562034f2ec3fce382cb208fab40586d005 [diff] | |
| parent | 563af16c30ede41eda2d614195d88e07f7c7103d [diff] |
Merge branch 'tip/tracing/ftrace-4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace