| commit | 2d074918fb1568f398777343ff9a28049fb86337 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Thu Mar 29 16:03:48 2018 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Thu Mar 29 16:03:48 2018 +0200 |
| tree | 84277c1471f6d575a9515d42a53345666addabc8 | |
| parent | 78282bec4b4a02a13b87d01fbe529396d37db926 [diff] | |
| parent | f67b15037a7a50c57f72e69a6d59941ad90a0f0f [diff] |
Merge branch 'perf/urgent' into perf/core Conflicts: kernel/events/hw_breakpoint.c Signed-off-by: Ingo Molnar <mingo@kernel.org>