| commit | 3f986eefc89c528bf2d398a6dc3637b743a7139e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Mar 07 09:23:12 2018 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Mar 07 09:23:12 2018 +0100 |
| tree | 8a0b4ccffa3502b7907f6ce5ed50b7ca0092e5ee | |
| parent | 55b4ce61a2a1608881ef7eab8a4e3fab3718dc4d [diff] | |
| parent | 629ae2ee73e225fa7dcce581c005d773b0190dcc [diff] |
Merge branch 'perf/urgent' into perf/core, to resolve conflict Conflicts: tools/perf/perf.h Signed-off-by: Ingo Molnar <mingo@kernel.org>