git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.