| commit | d71b0ad8d30922ccdd0705318237e6890b4ec1b6 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Sep 16 09:19:56 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Sep 16 09:19:56 2015 +0200 |
| tree | 347c773357c1afc87d65f767258317164bc0e31e | |
| parent | a4d71093e759b7cfe0babbc6ae89c8130532f6ad [diff] | |
| parent | f6cf87f748ff9480f97ff9c5caf6d6faacf52aa1 [diff] |
Merge branch 'perf/urgent' into perf/core, to resolve a conflict Conflicts: tools/perf/ui/browsers/hists.c Signed-off-by: Ingo Molnar <mingo@kernel.org>