]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3e01309d5f7eaa79e69ff359e33218878208d0ea
tree991cd929069b4bbd11a4c8f0a8f1940cce82a618
parent2838dc8b690a7abbebae16b4fb2026c30e34eab5
parent45ba2f1a4b52851fc7e0d65016d3ef05fcd48b9b
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/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>