| commit | 72b623c73685e86b70a51855e1058ebc98a9f6ed | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sun Feb 15 20:43:03 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Feb 15 20:43:03 2009 +0100 |
| tree | ce0942ca907ad09480358076fd2724f8c1d10547 | |
| parent | 9abd60304816a5b0fd9e51034f78e3eaed89f901 [diff] | |
| parent | b5f9fd0f8a05c9bafb91a9a85b9110938d8e585b [diff] |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/power-tracer