| commit | 629b3df7ecb01fddfdf71cb5d3c563d143117c33 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Mar 25 15:20:44 2020 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Mar 25 15:20:44 2020 +0100 |
| tree | a2e5ad1266c9660c934b9bf7a1621f6a3a48e28b | |
| parent | 3442a9ecb8e72a33c28a2b969b766c659830e410 [diff] | |
| parent | d97828072d0bcecb6655f0966efc38a2647d3dfb [diff] |
Merge branch 'x86/cpu' into perf/core, to resolve conflict Conflicts: arch/x86/events/intel/uncore.c Signed-off-by: Ingo Molnar <mingo@kernel.org>