Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Sun, 20 Oct 2013 08:51:35 +0000 (10:51 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 20 Oct 2013 08:51:35 +0000 (10:51 +0200)
commite4f8eaad70ea186b8da290c99239dce721a34f88
tree29083a5fab8cf752e01977addc4b958c05b9d346
parent31d141e3a666269a3b6fcccddb0351caf7454240
parent3090ffb5a2515990182f3f55b0688a7817325488
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>