Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes

include/uapi/linux/perf_event.h

kernel/events/core.c

tools/lib/traceevent/event-parse.c

tools/lib/traceevent/event-parse.h

tools/lib/traceevent/event-plugin.c

tools/lib/traceevent/plugin_function.c

tools/perf/Documentation/perf-report.txt

tools/perf/Documentation/perf-timechart.txt

tools/perf/Makefile.perf

tools/perf/builtin-inject.c

tools/perf/builtin-probe.c

tools/perf/config/Makefile

tools/perf/perf.c

tools/perf/tests/builtin-test.c

tools/perf/tests/dso-data.c

tools/perf/tests/dwarf-unwind.c

tools/perf/tests/make

tools/perf/tests/tests.h

tools/perf/util/dso.c

tools/perf/util/dso.h