]> 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)
commit2dc05fdadb461a2e44d4132f0eabb99c528c1ec9
treead712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6
parent5c49180f482a644c428c0419ce333fb7fe21bbcc
parentd0d216d30a0eb8ac77b5730050fcd864856c1c4b
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