]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3c2993b 87085ff)
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)
commitdd19802f2a224486c7f9a43bccd92e36c25afed9
treefff94fd674f5d25604dc13447577f9a9f84a1835tree | snapshot
parent3c2993b8c6143d8a5793746a54eba8f86f95240fcommit | diff
parent87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83commit | diff
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.
Michael's Linux tree.