From: Ingo Molnar Date: Thu, 4 Dec 2008 08:07:44 +0000 (+0100) Subject: Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing... X-Git-Tag: v2.6.29-rc1~586^2~34 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b29144c317fb748dae6d72c0f88eda9d43165b8d;p=linux-2.6-omap-h63xx.git Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core --- b29144c317fb748dae6d72c0f88eda9d43165b8d