From: Ingo Molnar Date: Thu, 18 Dec 2008 11:51:05 +0000 (+0100) Subject: Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core X-Git-Tag: firefly_0821_release~13991^2~412 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=40874491f9e9a4cb08eaf663dbe018bf5671975a;p=firefly-linux-kernel-4.4.55.git Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core --- 40874491f9e9a4cb08eaf663dbe018bf5671975a