From: Ingo Molnar Date: Fri, 12 Dec 2008 06:40:08 +0000 (+0100) Subject: Merge branches 'tracing/function-graph-tracer' and 'tracing/ring-buffer' into tracing... X-Git-Tag: v2.6.29-rc1~586^2~15 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f3134de60624829a57741c1f3796847d4de165f6;p=linux-2.6-omap-h63xx.git Merge branches 'tracing/function-graph-tracer' and 'tracing/ring-buffer' into tracing/core --- f3134de60624829a57741c1f3796847d4de165f6