Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Tue, 3 Mar 2009 15:02:16 +0000 (16:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 3 Mar 2009 15:02:16 +0000 (16:02 +0100)
commit3612fdf780e28b10323dd12d2b0f306c7ada4d4c
tree6749928731df6d9fd5da502d6c16dc656b64850e
parent654952bcb999ad96e1d9ae9145fe5c0522ec297a
parent633ddaa7f471e9db181f993c1458d6f4bae321ca
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace