From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 30 Jul 2014 12:51:06 +0000 (+0200)
Subject: Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~3503^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f9b9f812235d53f774a083e88a5a23b517a69752;p=firefly-linux-kernel-4.4.55.git

Merge tag 'perf-core-for-mingo' of git://git./linux/kernel/git/jolsa/perf into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

 * Fix perf usage string leftover (Jiri Olsa)

 * Revert "perf tools: Fix jump label always changing during tracing" (Jiri Olsa)

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

f9b9f812235d53f774a083e88a5a23b517a69752