diff options
| author | Borislav Petkov <bp@suse.de> | 2020-05-07 12:27:43 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-05-07 12:27:43 +0200 |
| commit | 51485635ebc25267ebab548a1bce43f823d9c0c5 (patch) | |
| tree | 152408c7f8959f6871b655d9193a76b529faa4bb /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | e9d7144597b10ff13ff2264c059f7d4a7fbc89ac (diff) | |
| parent | fb9cbbc895eb6e986dc90c928a35c793d75f435a (diff) | |
Merge 'x86/urgent' into x86/cpu
... to resolve conflicting changes to arch/x86/kernel/apic/apic.c
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions