Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:38:31 +0000 (22:38 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:38:31 +0000 (22:38 +0100)
commited662d9b2a6cb26e1399f57b88b565c0a68c60d4
tree4cca36ab5aa5aa08b799c8f9bbe3888b55682694
parentfdfa66ab455c79d699833c43ac0e09900133fd7c
parent96ccd21cd13140221bda74a4fc4e53ffeba7c7d4
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace