Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 11:51:05 +0000 (12:51 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 11:51:05 +0000 (12:51 +0100)

Trivial merge