From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 15 Apr 2012 06:02:36 +0000 (+0200)
Subject: Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.4-rc4~37^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7ea6411f4ceb62e5e53170d59d10996dca20c599;p=~emulex%2Finfiniband.git

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

Pull perf tooling fixes from Arnaldo Carvalho de Melo:

. Properly handle ~/.debug, the build id cache, when it is a symlink,
  fix from Chanho Park

. Fixes for the parser generation process, from Jiri Olsa and Namhyung Kim

. Fix build when NO_GTK2 is specified, From Stephane Eranian

. When a machine is not found, bump the relevant error stat but return
  0, so that we correctly move to the next perf event. Fix from Jiri Olsa

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

7ea6411f4ceb62e5e53170d59d10996dca20c599