Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer...
authorIngo Molnar <mingo@elte.hu>
Thu, 25 Dec 2008 12:11:00 +0000 (13:11 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 25 Dec 2008 12:11:00 +0000 (13:11 +0100)

Trivial merge