]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branches 'tracing/function-graph-tracer' and 'tracing/ring-buffer' into tracing...
authorIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 06:40:08 +0000 (07:40 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 06:40:08 +0000 (07:40 +0100)

Trivial merge