Merge branches 'tracing/hw-branch-tracing' and 'tracing/power-tracer' into tracing...
authorIngo Molnar <mingo@elte.hu>
Tue, 17 Feb 2009 10:29:53 +0000 (11:29 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Feb 2009 10:29:53 +0000 (11:29 +0100)

Trivial merge