diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 07:29:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 07:29:44 -0700 |
| commit | 194c8581eb9b6d42e9232c7693d86d2ee3799986 (patch) | |
| tree | 86d926b7407c33379dd719fad2ccaf03d5c5228a /Makefile | |
| parent | c0ff9019ee64101fda8f19338da799fda8217e14 (diff) | |
| parent | 33688abb2802ff3a230bd2441f765477b94cc89e (diff) | |
Merge 4.7-rc4 into char-misc-next
We want those fixes in here to help with merge issues.
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
@@ -1,7 +1,7 @@ VERSION = 4 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc4 NAME = Psychotic Stoned Sheep # *DOCUMENTATION* |