Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 23 Sep 2015 07:41:09 +0000 (09:41 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 23 Sep 2015 07:41:09 +0000 (09:41 +0200)
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  - Fix libtraceevent string handling in heterogeneous arch environments. (Kapileshwar Singh)

  - Avoid infinite loop at buildid processing with no samples in 'perf record'. (Mark Rutland)

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

Trivial merge