Merge branch 'perf/urgent' into perf/core, to resolve a conflict
authorIngo Molnar <mingo@kernel.org>
Wed, 16 Sep 2015 07:19:56 +0000 (09:19 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 16 Sep 2015 07:19:56 +0000 (09:19 +0200)
commitd71b0ad8d30922ccdd0705318237e6890b4ec1b6
tree347c773357c1afc87d65f767258317164bc0e31e
parenta4d71093e759b7cfe0babbc6ae89c8130532f6ad
parentf6cf87f748ff9480f97ff9c5caf6d6faacf52aa1
Merge branch 'perf/urgent' into perf/core, to resolve a conflict

Conflicts:
tools/perf/ui/browsers/hists.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
tools/perf/ui/browsers/hists.c
tools/perf/util/evlist.c
tools/perf/util/evsel.c
tools/perf/util/evsel.h
tools/perf/util/header.c
tools/perf/util/parse-events.c