diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-29 16:03:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-29 16:03:48 +0200 |
| commit | 2d074918fb1568f398777343ff9a28049fb86337 (patch) | |
| tree | 84277c1471f6d575a9515d42a53345666addabc8 /kernel/events/core.c | |
| parent | 78282bec4b4a02a13b87d01fbe529396d37db926 (diff) | |
| parent | f67b15037a7a50c57f72e69a6d59941ad90a0f0f (diff) | |
| download | op-kernel-dev-2d074918fb1568f398777343ff9a28049fb86337.zip op-kernel-dev-2d074918fb1568f398777343ff9a28049fb86337.tar.gz | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
kernel/events/hw_breakpoint.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/core.c')
0 files changed, 0 insertions, 0 deletions
