diff options
author | Will Deacon <will.deacon@arm.com> | 2017-06-26 10:54:27 +0100 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2017-06-26 10:54:27 +0100 |
commit | 3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb (patch) | |
tree | 81e5823a1c84a0131dc110f711f3c1416b4df985 /Makefile | |
parent | 9ad95c46c18ba828dfcf467024a45eb5b43ce769 (diff) | |
parent | 77b246b32b2c4bc21e352dcb8b53a8aba81ee5a4 (diff) | |
download | linux-3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb.tar.bz2 |
Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core
Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 4 PATCHLEVEL = 12 SUBLEVEL = 0 -EXTRAVERSION = -rc3 +EXTRAVERSION = -rc4 NAME = Fearless Coyote # *DOCUMENTATION* |