diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-15 21:02:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-15 21:02:16 +0200 |
| commit | 8ed9eac4769407a8f0b93e381a3bc3ae81fa014b (patch) | |
| tree | 4a2d37876da0146b845dabca67c3390182881a09 /kernel/events/core.c | |
| parent | a70270468234749741c5893ae78e5bb524771402 (diff) | |
| parent | cb9dd49e11f83d548c822d7022ac180b0518b25c (diff) | |
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 <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/core.c')
0 files changed, 0 insertions, 0 deletions