]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 18 Nov 2008 07:52:13 +0000 (08:52 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 18 Nov 2008 07:52:13 +0000 (08:52 +0100)
commit5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371
tree02e63e90cc26792eaea21dced12bd7c10f996d30
parent3f8e402f34ecc7d1d00b54703d3baa401b8bdd78
parent0c726da983de0704254250ef6495ca152e7abcca
parente270219f4372b58bd3eeac12bd9f7edc592b8f6b
Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core
kernel/trace/trace.c
kernel/trace/trace.h