| commit | 9a1043d19c4edc4ff1d80081a39809a506a62e4d | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Mar 10 09:57:16 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Mar 10 09:57:16 2009 +0100 |
| tree | a8ba7bdb2ebe8e486f018d55969727abf14e7e33 | |
| parent | 12e87e36e0141c08dbc8b2177c93c75fb18ad7e5 [diff] | |
| parent | 157587d7ac555458da9f682e3250135e468470a6 [diff] |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace