From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 20 Oct 2013 08:51:35 +0000 (+0200)
Subject: Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~13407^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e4f8eaad70ea186b8da290c99239dce721a34f88;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

" * Fix build error on Fedora 12.

  * Fix to initialize fname always before use it, bug introduced
    during this merge window, from Masami Hiramatsu.

  * Disable PERF_RECORD_MMAP2 support, from Stephane Eranian. "

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

e4f8eaad70ea186b8da290c99239dce721a34f88