]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 23 Apr 2014 13:08:00 +0000 (15:08 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 23 Apr 2014 13:08:00 +0000 (15:08 +0200)
Pull perf/urgent fixes from Jiri Olsa:

  * Fix memory leak and backward compatibility macros for pevent
    filter enums in traceevent library (Steven Rostedt)

  * Disable libdw unwind for all but x86 arch (Jiri Olsa)

  * Fix memory leak in sample_ustack (Masanari Iida)

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

Trivial merge