]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf3e3af72f2816965b0c7761dee2b481d5ed554aa
treee8de975fd5de6c95bf4329861a872dbcfe0c7ead
parent0221d6d50a2d04d2a6104af0b35ec2c9a46b4731
parentb658f09ee95da1dbb2b1c02703e0db06bf9a2734
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