From: Ingo Molnar Date: Mon, 26 Jan 2009 13:01:52 +0000 (+0100) Subject: Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing... X-Git-Tag: v2.6.30-rc1~2^2~152 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ce1b1ed27d4ab1d81b8543a96f488bba2071576;p=thirdparty%2Fkernel%2Flinux.git Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core --- 5ce1b1ed27d4ab1d81b8543a96f488bba2071576