From: Will Deacon Date: Tue, 20 Jun 2017 18:11:48 +0000 (+0100) Subject: Merge branch 'uuid-types' of git://git.infradead.org/users/hch/uuid into aarch64... X-Git-Tag: v4.13-rc1~147^2~16^2~12 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dd19802f2a224486c7f9a43bccd92e36c25afed9;p=karo-tx-linux.git 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. --- dd19802f2a224486c7f9a43bccd92e36c25afed9