| commit | 44b0635481437140b0e29d6023f05e805d5e7620 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Feb 09 10:35:12 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Feb 09 10:35:12 2009 +0100 |
| tree | ff31986115075410d0479df307a6b9841976026c | |
| parent | 4ad476e11f94fd3724c6e272d8220e99cd222b27 [diff] | |
| parent | 57794a9d48b63e34acbe63282628c9f029603308 [diff] |
Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace Conflicts: kernel/trace/trace_hw_branches.c