| commit | dd19802f2a224486c7f9a43bccd92e36c25afed9 | [log] [tgz] |
|---|---|---|
| author | Will Deacon <will.deacon@arm.com> | Tue Jun 20 19:11:48 2017 +0100 |
| committer | Will Deacon <will.deacon@arm.com> | Tue Jun 20 19:11:48 2017 +0100 |
| tree | fff94fd674f5d25604dc13447577f9a9f84a1835 | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f [diff] | |
| parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 [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.