]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'uuid-types' of git://git.infradead.org/users/hch/uuid into aarch64...
authorWill Deacon <will.deacon@arm.com>
Tue, 20 Jun 2017 18:11:48 +0000 (19:11 +0100)
committerWill Deacon <will.deacon@arm.com>
Tue, 20 Jun 2017 18:11:48 +0000 (19:11 +0100)
commit2377bbe8f69175c2a8a83d1fc90daf67e8cd3877
treefff94fd674f5d25604dc13447577f9a9f84a1835
parent49c17db395f90900cd2ed628cca4eaf1e62979b9
parent0b670a113d3b10a2e695f04e67b992092463b129
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.