Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 08:57:16 +0000 (09:57 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 08:57:16 +0000 (09:57 +0100)
commit9a1043d19c4edc4ff1d80081a39809a506a62e4d
treea8ba7bdb2ebe8e486f018d55969727abf14e7e33
parent12e87e36e0141c08dbc8b2177c93c75fb18ad7e5
parent157587d7ac555458da9f682e3250135e468470a6
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace