| commit | aeffe2abc894b585acbe0923c0d4f21b4c5c1035 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Thu May 01 08:24:39 2014 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Thu May 01 08:24:39 2014 +0200 |
| tree | ad712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6 | |
| parent | 201131998fbf074b03679afedcc29948e63331ef [diff] | |
| parent | 399f0c220a0ee97a5a9ea1a699a58fe2aacf2983 [diff] |
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>