]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'tracing/ftrace' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 29 Jan 2009 13:27:58 +0000 (14:27 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 29 Jan 2009 13:27:58 +0000 (14:27 +0100)

Trivial merge