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: Ubuntu-snapdragon-4.4.0-1050.54~28577^2~36 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f0461d0146ee30927bc7efa2ae24ea8c6693b725;p=mirror_ubuntu-artful-kernel.git Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core --- f0461d0146ee30927bc7efa2ae24ea8c6693b725