Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 10:40:37 +0000 (11:40 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 10:40:37 +0000 (11:40 +0100)
commitbc722f508a5bcbb65a7bb0c7ce8e3934f5763a1a
treed6494e409a671669614e7a08a5328e8def277225
parent16097439703bcd38e9fe5608c12add6dacb825ea
parent770cb24345c0f6e0d47bd2b94aa6d67bea6f8b54
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace