From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 23 Mar 2012 08:16:03 +0000 (+0100)
Subject: Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.4-rc1~4^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5bc437702b24817cabd65a6a57971ff91a7712c;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'perf-core-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/urgent

Cleanups and fixes for perf/core:

. Short term fix for 'diff' tool breakage related to perf.data files
  with multiple events. From Jiri Olsa

. Cleanup for event id tracepoint reading routine, from Borislav Petkov

. 32-bit compilation fixes from Jiri Olsa

. Event parsing modifier assignment fixes from Jiri Olsa

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

c5bc437702b24817cabd65a6a57971ff91a7712c