]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer' into tracing...
authorIngo Molnar <mingo@elte.hu>
Wed, 26 Nov 2008 00:58:05 +0000 (01:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 26 Nov 2008 00:58:05 +0000 (01:58 +0100)

Trivial merge