diff options
author | 2017-06-20 19:11:48 +0100 | |
---|---|---|
committer | 2017-06-20 19:11:48 +0100 | |
commit | dd19802f2a224486c7f9a43bccd92e36c25afed9 (patch) | |
tree | fff94fd674f5d25604dc13447577f9a9f84a1835 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Linux 4.12-rc4 (diff) | |
parent | thermal: int340x_thermal: fix compile after the UUID API switch (diff) | |
download | wireguard-linux-dd19802f2a224486c7f9a43bccd92e36c25afed9.tar.xz wireguard-linux-dd19802f2a224486c7f9a43bccd92e36c25afed9.zip |
Merge branch 'uuid-types' of git://git.infradead.org/users/hch/uuid into aarch64/for-next/ras-apei
Pull in uuid-types branch from Christoph, since this conflicts heavily
with the ACPI/APEI RAS work from Tyler Baicer and was created as an
immutable branch to avoid conflicts with ACPI development.
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions