From: Ingo Molnar Date: Wed, 3 Dec 2008 07:49:21 +0000 (+0100) Subject: Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing... X-Git-Tag: v2.6.29-rc1~586^2~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0461d0146ee30927bc7efa2ae24ea8c6693b725;p=thirdparty%2Flinux.git Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core --- f0461d0146ee30927bc7efa2ae24ea8c6693b725