]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb2b8e7aee00769abffcd6b3e09c0410d0e8d5ac0
treead712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6
parentaac1fcbc338434c0e6c27bffa700b331d95c26a1
parent860c4cda91da882b4a92790c1310d3393e781e49
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