Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Fri, 15 Jun 2012 19:02:16 +0000 (21:02 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 15 Jun 2012 19:02:16 +0000 (21:02 +0200)
commit8ed9eac4769407a8f0b93e381a3bc3ae81fa014b
tree4a2d37876da0146b845dabca67c3390182881a09
parenta70270468234749741c5893ae78e5bb524771402
parentcb9dd49e11f83d548c822d7022ac180b0518b25c
Merge tag 'perf-urgent-for-mingo' of git://git./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 <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>