Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Tue, 15 Apr 2014 17:25:07 +0000 (19:25 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 15 Apr 2014 17:25:07 +0000 (19:25 +0200)
commitad466db5b0c302e85ad96c42a43194c234cbd862
tree991cd929069b4bbd11a4c8f0a8f1940cce82a618
parentfbdd17ec5ce2e5e4027356fcfde769b88d15702f
parentc9e87a472594fd237b2d19dcbe4a3424297f0b1a
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>