Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Tue, 29 Oct 2013 10:23:32 +0000 (11:23 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 29 Oct 2013 10:23:32 +0000 (11:23 +0100)
commitaac898548d04c7bff179b79f805874b0d6f87571
treee8de975fd5de6c95bf4329861a872dbcfe0c7ead
parent2f5e98802350627ad6f2e3cee4d177059fc0c2f2
parentcd65718712469ad844467250e8fad20a5838baae
Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/hist.h
16 files changed:
kernel/events/core.c
tools/perf/Documentation/perf-record.txt
tools/perf/Documentation/perf-top.txt
tools/perf/builtin-kvm.c
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/builtin-trace.c
tools/perf/tests/perf-record.c
tools/perf/tests/task-exit.c
tools/perf/util/callchain.h
tools/perf/util/evlist.c
tools/perf/util/evlist.h
tools/perf/util/evsel.c
tools/perf/util/hist.h
tools/perf/util/probe-finder.c
tools/perf/util/python.c