Merge branch 'perf/urgent' into perf/core, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Thu, 1 May 2014 06:24:39 +0000 (08:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 1 May 2014 06:24:39 +0000 (08:24 +0200)
commitaeffe2abc894b585acbe0923c0d4f21b4c5c1035
treead712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6
parent201131998fbf074b03679afedcc29948e63331ef
parent399f0c220a0ee97a5a9ea1a699a58fe2aacf2983
Merge branch 'perf/urgent' into perf/core, to resolve conflict

Conflicts:
tools/perf/arch/x86/tests/dwarf-unwind.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
tools/perf/Makefile.perf
tools/perf/arch/x86/tests/dwarf-unwind.c
tools/perf/util/machine.c