diff options
| author | Ingo Molnar <[email protected]> | 2018-10-02 07:51:41 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2018-10-02 07:51:41 +0000 |
| commit | a4c9f26533eb547c8123e9a5f77517f61d19d2c2 (patch) | |
| tree | 9767715779be7314ea86b1a83ae96f72e5ddb0da /arch/x86/platform/atom/punit_atom_debug.c | |
| parent | Merge branch 'perf/urgent' into perf/core, to pick up fixes (diff) | |
| parent | x86/intel_rdt: Use perf infrastructure for measurements (diff) | |
| download | kernel-a4c9f26533eb547c8123e9a5f77517f61d19d2c2.tar.gz kernel-a4c9f26533eb547c8123e9a5f77517f61d19d2c2.zip | |
Merge branch 'x86/cache' into perf/core, to resolve conflicts
Avoid conflict with upcoming perf/core patches, merge in the RDT perf work.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/x86/platform/atom/punit_atom_debug.c')
0 files changed, 0 insertions, 0 deletions