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)
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/hist.h


Trivial merge