From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 15 Apr 2014 17:25:07 +0000 (+0200)
Subject: Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~4043^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ad466db5b0c302e85ad96c42a43194c234cbd862;p=firefly-linux-kernel-4.4.55.git

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

Pull perf/urgent fixes from Jiri Olsa:

  * Instead of redirecting flex output, use -o (Cody P Schafer)

  * Fix double free in perf test 21 (Adrian Hunter)

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

ad466db5b0c302e85ad96c42a43194c234cbd862