Merge branch 'rfc/splice/tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux...
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:15:42 +0000 (11:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:15:42 +0000 (11:15 +0100)
commit2602c3ba4508f528db024c1d209256513ea05de6
tree5713aaad7c95ca810c91fe104407a06b7e4bc4bf
parenta1be621dfacbef0fd374d8acd553d71e07bf29ac
parent2cadf9135eb3b6d84b6427314be827ddd443c308
Merge branch 'rfc/splice/tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace