From: Ingo Molnar Date: Fri, 15 Jun 2012 19:02:16 +0000 (+0200) Subject: Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.5-rc4~8^2~2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8ed9eac4769407a8f0b93e381a3bc3ae81fa014b;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 fixes from Arnaldo Carvalho de Melo: * Set name of tracepoints when reading the perf.data headers, so that we don't end up using the local ones, from /sys. * Fix default output file for perf stat, from Stephane Eranian. * Fix endian handling of features bitmask in perf.data header, from David Ahern. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ingo Molnar --- 8ed9eac4769407a8f0b93e381a3bc3ae81fa014b