diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 15:47:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-26 15:47:03 -0400 |
| commit | 1e1b37273cf719545da50b76f214f983a710aaf4 (patch) | |
| tree | 033f6062325ef7aaeefe8559bb409ab7d2be3c76 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | acpi: Fix broken error check in map_processor() (diff) | |
| parent | x86/apic: Fix num_processors value in case of failure (diff) | |
| download | wireguard-linux-1e1b37273cf719545da50b76f214f983a710aaf4.tar.xz wireguard-linux-1e1b37273cf719545da50b76f214f983a710aaf4.zip | |
Merge branch 'x86/urgent' into x86/apic
Bring in the upstream modifications so we can fixup the silent merge
conflict which is introduced by this merge.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions