Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'linus' into tracing...
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 02:47:27 +0000 (03:47 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 02:47:27 +0000 (03:47 +0100)

Trivial merge