]> 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)
commit38a1831bc0d932134e6d22b9b8d9a0b6c0958372
tree991cd929069b4bbd11a4c8f0a8f1940cce82a618
parentd1e25996f48b8440e1f0f86989a8ffca4d6f0b53
parente6f79286facafba79f7f2d71566fcf2a99787c55
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>