Merge tag 'perf-urgent-for-mingo-20160527' of git://git.kernel.org/pub/scm/linux...
authorIngo Molnar <mingo@kernel.org>
Sun, 29 May 2016 18:15:37 +0000 (20:15 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 29 May 2016 18:15:37 +0000 (20:15 +0200)
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 - Fix kptr_restrict=2 related 'perf record' segfault (Wang Nan)

 - Fix CTF/libbabeltrace handling of chinese COMM strings (Wang Nan)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge