diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 11:05:58 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-11 11:05:58 +0300 |
commit | 5c07488d996b6b2af609f351bf54c9909ed0fdf8 (patch) | |
tree | 62cc2522698d7383cdf4a4f450bde30bc45f1832 /Makefile | |
parent | b5390f4b5e0b75634c7f08c88e97b5fe0e833599 (diff) | |
parent | d13937116f1e82bf508a6325111b322c30c85eb9 (diff) | |
download | linux-5c07488d996b6b2af609f351bf54c9909ed0fdf8.tar.xz |
Merge 5.0-rc6 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ VERSION = 5 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc6 NAME = Shy Crocodile # *DOCUMENTATION* |