diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-11 10:47:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-11 10:47:28 +0200 |
| commit | b6466d53afdb0c3ca058848cd4c12e141aba0763 (patch) | |
| tree | 06da4bf69879a7a26dc78d1b4f4b47ca4aaf4c74 /tools/perf/scripts/python | |
| parent | x86/intel_rdt: Add cpus_list rdtgroup file (diff) | |
| parent | x86/intel_rdt: Fix locking in rdtgroup_schemata_write() (diff) | |
| download | linux-b6466d53afdb0c3ca058848cd4c12e141aba0763.tar.gz linux-b6466d53afdb0c3ca058848cd4c12e141aba0763.zip | |
Merge branch 'x86/urgent' into x86/cpu, to resolve conflict
Conflicts:
arch/x86/kernel/cpu/intel_rdt_schemata.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions