]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'tracing/ftrace' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 23 Jan 2009 10:10:03 +0000 (11:10 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 23 Jan 2009 10:10:03 +0000 (11:10 +0100)

Trivial merge